49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
From f0daf93e682a07f29197a62da1ea72bf170ca3a8 Mon Sep 17 00:00:00 2001
|
|
From: zhangyiru330 <zhangyiru3@huawei.com>
|
|
Date: Tue, 11 Jan 2022 11:00:12 +0800
|
|
Subject: [PATCH] skip tcm_asserts_unittest
|
|
|
|
skip this testcase temporarily to ensure 22.03 build.
|
|
---
|
|
Makefile.am | 2 ++
|
|
configure.ac | 3 +++
|
|
2 files changed, 5 insertions(+)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index bc61f62..0862487 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -1015,6 +1015,7 @@ tcmalloc_unittest_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
|
|
# first linkline to make sure our malloc 'wins'.
|
|
tcmalloc_unittest_LDADD = $(LIBTCMALLOC) liblogging.la $(PTHREAD_LIBS)
|
|
|
|
+if X86_64
|
|
TESTS += tcm_asserts_unittest
|
|
tcm_asserts_unittest_INCLUDES = src/config_for_unittests.h \
|
|
src/gperftools/malloc_extension.h
|
|
@@ -1025,6 +1026,7 @@ tcm_asserts_unittest_SOURCES = src/tests/tcmalloc_unittest.cc \
|
|
tcm_asserts_unittest_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
|
|
tcm_asserts_unittest_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
|
|
tcm_asserts_unittest_LDADD = libtcmalloc_with_asserts.la liblogging.la $(PTHREAD_LIBS)
|
|
+endif X86_64
|
|
|
|
# This makes sure it's safe to link in both tcmalloc and
|
|
# tcmalloc_minimal. (One would never do this on purpose, but perhaps
|
|
diff --git a/configure.ac b/configure.ac
|
|
index c419d5f..7b57eb5 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -306,6 +306,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [return __i386__ == 1 ? 0 : 1])],
|
|
[is_i386=yes], [is_i386=no])
|
|
AM_CONDITIONAL(I386, test "$is_i386" = yes)
|
|
|
|
+# add x86_64 architecture to skip tcm_asserts_unittest
|
|
+AM_CONDITIONAL(X86_64, test `uname -m` = "x86_64")
|
|
+
|
|
# See if the compiler supports -Wno-unused-result.
|
|
# Newer ubuntu's turn on -D_FORTIFY_SOURCE=2, enabling
|
|
# __attribute__((warn_unused_result)) for things like write(),
|
|
--
|
|
1.8.3.1
|
|
|