Wait, why? I specifically kept them separate.<br><div><br></div><div>I would really like to limit the amount of code that touches the instrumented bits of this as they are quite brittle. I'm working on bringing up the test-running infrastructure so that you can run arbitrarily many test binaries....</div>
<div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Jun 29, 2012 at 3:23 AM, Alexey Samsonov <span dir="ltr"><<a href="mailto:samsonov@google.com" target="_blank">samsonov@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: samsonov<br>
Date: Fri Jun 29 05:23:31 2012<br>
New Revision: 159419<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=159419&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=159419&view=rev</a><br>
Log:<br>
[ASan] cmake-based unit tests: merge instrumented and non-instrumented files into one test binary<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/asan/tests/CMakeLists.txt<br>
<br>
Modified: compiler-rt/trunk/lib/asan/tests/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/CMakeLists.txt?rev=159419&r1=159418&r2=159419&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/CMakeLists.txt?rev=159419&r1=159418&r2=159419&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/tests/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/asan/tests/CMakeLists.txt Fri Jun 29 05:23:31 2012<br>
@@ -20,6 +20,27 @@<br>
   -fvisibility=hidden<br>
 )<br>
<br>
+set(ASAN_GTEST_INCLUDE_CFLAGS<br>
+  -I${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include<br>
+  -I${LLVM_MAIN_SRC_DIR}/include<br>
+  -I${LLVM_BINARY_DIR}/include<br>
+  -D__STDC_CONSTANT_MACROS<br>
+  -D__STDC_LIMIT_MACROS<br>
+)<br>
+<br>
+set(ASAN_UNITTEST_INSTRUMENTED_CFLAGS<br>
+  ${ASAN_UNITTEST_COMMON_CFLAGS}<br>
+  ${ASAN_GTEST_INCLUDE_CFLAGS}<br>
+  -faddress-sanitizer<br>
+  -O2<br>
+  -g<br>
+  -mllvm "-asan-blacklist=${CMAKE_CURRENT_SOURCE_DIR}/asan_test.ignore"<br>
+  -DASAN_HAS_BLACKLIST=1<br>
+  -DASAN_HAS_EXCEPTIONS=1<br>
+  -DASAN_NEEDS_SEGV=1<br>
+  -DASAN_UAR=0<br>
+)<br>
+<br>
 add_custom_target(AsanTests)<br>
 set_target_properties(AsanTests PROPERTIES FOLDER "ASan tests")<br>
 function(add_asan_test testname)<br>
@@ -42,30 +63,9 @@<br>
          "${compile_flags} ${add_compile_flags}")<br>
 endfunction()<br>
<br>
-add_asan_test(AsanNoInstrumentationTests<br>
-       asan_noinst_test.cc<br>
-       asan_break_optimization.cc<br>
-       )<br>
-<br>
-set(ASAN_GTEST_INCLUDE_CFLAGS<br>
-  -I${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include<br>
-  -I${LLVM_MAIN_SRC_DIR}/include<br>
-  -I${LLVM_BINARY_DIR}/include<br>
-  -D__STDC_CONSTANT_MACROS<br>
-  -D__STDC_LIMIT_MACROS<br>
-)<br>
-<br>
-set(ASAN_UNITTEST_INSTRUMENTED_CFLAGS<br>
-  ${ASAN_UNITTEST_COMMON_CFLAGS}<br>
-  ${ASAN_GTEST_INCLUDE_CFLAGS}<br>
-  -faddress-sanitizer<br>
-  -O2<br>
-  -g<br>
-  -mllvm "-asan-blacklist=${CMAKE_CURRENT_SOURCE_DIR}/asan_test.ignore"<br>
-  -DASAN_HAS_BLACKLIST=1<br>
-  -DASAN_HAS_EXCEPTIONS=1<br>
-  -DASAN_NEEDS_SEGV=1<br>
-  -DASAN_UAR=0<br>
+set(ASAN_TEST_FILES<br>
+  asan_noinst_test.cc<br>
+  asan_break_optimization.cc<br>
 )<br>
<br>
 # We only support building instrumented tests when we're not cross compiling<br>
@@ -102,21 +102,17 @@<br>
<br>
   add_asan_compile_cxx_command(asan_globals_test.cc)<br>
   add_asan_compile_cxx_command(asan_test.cc)<br>
-  set(ASAN_INSTRUMENTED_TESTS<br>
+  list(APPEND ASAN_TEST_FILES<br>
     asan_globals_test.cc.asan.o<br>
     asan_test.cc.asan.o<br>
   )<br>
   if (APPLE)<br>
     add_asan_compile_objc_command(<a href="http://asan_mac_test.mm" target="_blank">asan_mac_test.mm</a>)<br>
-    set(ASAN_INSTRUMENTED_TESTS<br>
-      ${ASAN_INSTRUMENTED_TESTS}<br>
-      asan_mac_test.mm.asan.o<br>
-    )<br>
+    list(APPEND ASAN_TEST_FILES asan_mac_test.mm.asan.o)<br>
   endif()<br>
<br>
-       add_asan_test(AsanInstrumentationTests<br>
-               ${ASAN_INSTRUMENTED_TESTS}<br>
-               asan_break_optimization.cc<br>
-               )<br>
-<br>
 endif()<br>
+<br>
+add_asan_test(AsanTest<br>
+  ${ASAN_TEST_FILES}<br>
+)<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>