diff options
Diffstat (limited to 'lib/tsan/Makefile.old')
-rw-r--r-- | lib/tsan/Makefile.old | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/tsan/Makefile.old b/lib/tsan/Makefile.old index b548f5d2f6ee..c10d49842cac 100644 --- a/lib/tsan/Makefile.old +++ b/lib/tsan/Makefile.old @@ -21,8 +21,11 @@ GTEST_BUILD_DIR=$(GTEST_ROOT)/build GTEST_LIB_NAME=gtest-all.o GTEST_LIB=$(GTEST_BUILD_DIR)/$(GTEST_LIB_NAME) -SANITIZER_COMMON_TESTS_SRC=$(wildcard ../sanitizer_common/tests/*_test.cc) -SANITIZER_COMMON_TESTS_OBJ=$(patsubst %.cc,%.o,$(SANITIZER_COMMON_TESTS_SRC)) +SANITIZER_TESTS_PATH=../sanitizer_common/tests +SANITIZER_COMMON_TESTS_SRC=$(wildcard $(SANITIZER_TESTS_PATH)/*_test.cc) +SANITIZER_COMMON_EXCLUDED_TESTS=$(SANITIZER_TESTS_PATH)/sanitizer_nolibc_test.cc +SANITIZER_COMMON_GOOD_TESTS=$(filter-out $(SANITIZER_COMMON_EXCLUDED_TESTS), $(SANITIZER_COMMON_TESTS_SRC)) +SANITIZER_COMMON_TESTS_OBJ=$(patsubst %.cc,%.o,$(SANITIZER_COMMON_GOOD_TESTS)) RTL_TEST_SRC=$(wildcard tests/rtl/*.cc) RTL_TEST_OBJ=$(patsubst %.cc,%.o,$(RTL_TEST_SRC)) UNIT_TEST_SRC=$(wildcard tests/unit/*_test.cc) @@ -51,7 +54,7 @@ libtsan: tsan_test: $(UNIT_TEST_OBJ) $(RTL_TEST_OBJ) \ $(SANITIZER_COMMON_TESTS_OBJ) $(LIBTSAN) $(GTEST_LIB) - $(CXX) $^ -o $@ $(LDFLAGS) + $(CXX) -Wl,--whole-archive $^ -Wl,--no-whole-archive -o $@ $(LDFLAGS) test: libtsan tsan_test |