[compiler-rt] r182837 - Exclude sanitizer_nolibc_test from TSan test run. Fix lint warnings

[Alexey Samsonov]

Author: samsonov
Date: Wed May 29 04:40:07 2013
New Revision: 182837

URL: http://llvm.org/viewvc/llvm-project?rev=182837&view=rev
Log:
Exclude sanitizer_nolibc_test from TSan test run. Fix lint warnings

Modified:
    compiler-rt/trunk/lib/lsan/lit_tests/use_globals_initialized.cc
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator_internal.h
    compiler-rt/trunk/lib/tsan/Makefile.old

Modified: compiler-rt/trunk/lib/lsan/lit_tests/use_globals_initialized.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lit_tests/use_globals_initialized.cc?rev=182837&r1=182836&r2=182837&view=diff
==============================================================================
--- compiler-rt/trunk/lib/lsan/lit_tests/use_globals_initialized.cc (original)
+++ compiler-rt/trunk/lib/lsan/lit_tests/use_globals_initialized.cc Wed May 29 04:40:07 2013
@@ -1,4 +1,4 @@
-// Test that initialized globals are included in the root set. 
+// Test that initialized globals are included in the root set.
 // RUN: LSAN_BASE="report_blocks=1:use_stacks=0:use_registers=0"
 // RUN: %clangxx_lsan %s -o %t
 // RUN: LSAN_OPTIONS=$LSAN_BASE:"use_globals=0" %t 2>&1 | FileCheck %s

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator_internal.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator_internal.h?rev=182837&r1=182836&r2=182837&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator_internal.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator_internal.h Wed May 29 04:40:07 2013
@@ -19,7 +19,7 @@
 
 namespace __sanitizer {
 
-// TODO: Check if we may use even more compact size class map for internal
+// FIXME: Check if we may use even more compact size class map for internal
 // purposes.
 typedef CompactSizeClassMap InternalSizeClassMap;
 

Modified: compiler-rt/trunk/lib/tsan/Makefile.old
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/Makefile.old?rev=182837&r1=182836&r2=182837&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/Makefile.old (original)
+++ compiler-rt/trunk/lib/tsan/Makefile.old Wed May 29 04:40:07 2013
@@ -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)