[llvm-commits] [compiler-rt] r159419 - /compiler-rt/trunk/lib/asan/tests/CMakeLists.txt

[Kostya Serebryany]

On Fri, Jun 29, 2012 at 2:41 PM, Chandler Carruth <chandlerc at google.com>wrote:

> Wait, why? I specifically kept them separate.
>
> I would really like to limit the amount of code that touches the
> instrumented bits of this as they are quite brittle.
>

I asked... Sorry, if that contradicts you.
We do want to compile those pieces separately, but I'd like to link them
together in one binary?
No?

--kcc


> I'm working on bringing up the test-running infrastructure so that you can
> run arbitrarily many test binaries....
>
>
> On Fri, Jun 29, 2012 at 3:23 AM, Alexey Samsonov <samsonov at google.com>wrote:
>
>> Author: samsonov
>> Date: Fri Jun 29 05:23:31 2012
>> New Revision: 159419
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=159419&view=rev
>> Log:
>> [ASan] cmake-based unit tests: merge instrumented and non-instrumented
>> files into one test binary
>>
>> Modified:
>>    compiler-rt/trunk/lib/asan/tests/CMakeLists.txt
>>
>> Modified: compiler-rt/trunk/lib/asan/tests/CMakeLists.txt
>> URL:
>> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/CMakeLists.txt?rev=159419&r1=159418&r2=159419&view=diff
>>
>> ==============================================================================
>> --- compiler-rt/trunk/lib/asan/tests/CMakeLists.txt (original)
>> +++ compiler-rt/trunk/lib/asan/tests/CMakeLists.txt Fri Jun 29 05:23:31
>> 2012
>> @@ -20,6 +20,27 @@
>>   -fvisibility=hidden
>>  )
>>
>> +set(ASAN_GTEST_INCLUDE_CFLAGS
>> +  -I${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include
>> +  -I${LLVM_MAIN_SRC_DIR}/include
>> +  -I${LLVM_BINARY_DIR}/include
>> +  -D__STDC_CONSTANT_MACROS
>> +  -D__STDC_LIMIT_MACROS
>> +)
>> +
>> +set(ASAN_UNITTEST_INSTRUMENTED_CFLAGS
>> +  ${ASAN_UNITTEST_COMMON_CFLAGS}
>> +  ${ASAN_GTEST_INCLUDE_CFLAGS}
>> +  -faddress-sanitizer
>> +  -O2
>> +  -g
>> +  -mllvm "-asan-blacklist=${CMAKE_CURRENT_SOURCE_DIR}/asan_test.ignore"
>> +  -DASAN_HAS_BLACKLIST=1
>> +  -DASAN_HAS_EXCEPTIONS=1
>> +  -DASAN_NEEDS_SEGV=1
>> +  -DASAN_UAR=0
>> +)
>> +
>>  add_custom_target(AsanTests)
>>  set_target_properties(AsanTests PROPERTIES FOLDER "ASan tests")
>>  function(add_asan_test testname)
>> @@ -42,30 +63,9 @@
>>          "${compile_flags} ${add_compile_flags}")
>>  endfunction()
>>
>> -add_asan_test(AsanNoInstrumentationTests
>> -       asan_noinst_test.cc
>> -       asan_break_optimization.cc
>> -       )
>> -
>> -set(ASAN_GTEST_INCLUDE_CFLAGS
>> -  -I${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include
>> -  -I${LLVM_MAIN_SRC_DIR}/include
>> -  -I${LLVM_BINARY_DIR}/include
>> -  -D__STDC_CONSTANT_MACROS
>> -  -D__STDC_LIMIT_MACROS
>> -)
>> -
>> -set(ASAN_UNITTEST_INSTRUMENTED_CFLAGS
>> -  ${ASAN_UNITTEST_COMMON_CFLAGS}
>> -  ${ASAN_GTEST_INCLUDE_CFLAGS}
>> -  -faddress-sanitizer
>> -  -O2
>> -  -g
>> -  -mllvm "-asan-blacklist=${CMAKE_CURRENT_SOURCE_DIR}/asan_test.ignore"
>> -  -DASAN_HAS_BLACKLIST=1
>> -  -DASAN_HAS_EXCEPTIONS=1
>> -  -DASAN_NEEDS_SEGV=1
>> -  -DASAN_UAR=0
>> +set(ASAN_TEST_FILES
>> +  asan_noinst_test.cc
>> +  asan_break_optimization.cc
>>  )
>>
>>  # We only support building instrumented tests when we're not cross
>> compiling
>> @@ -102,21 +102,17 @@
>>
>>   add_asan_compile_cxx_command(asan_globals_test.cc)
>>   add_asan_compile_cxx_command(asan_test.cc)
>> -  set(ASAN_INSTRUMENTED_TESTS
>> +  list(APPEND ASAN_TEST_FILES
>>     asan_globals_test.cc.asan.o
>>     asan_test.cc.asan.o
>>   )
>>   if (APPLE)
>>     add_asan_compile_objc_command(asan_mac_test.mm)
>> -    set(ASAN_INSTRUMENTED_TESTS
>> -      ${ASAN_INSTRUMENTED_TESTS}
>> -      asan_mac_test.mm.asan.o
>> -    )
>> +    list(APPEND ASAN_TEST_FILES asan_mac_test.mm.asan.o)
>>   endif()
>>
>> -       add_asan_test(AsanInstrumentationTests
>> -               ${ASAN_INSTRUMENTED_TESTS}
>> -               asan_break_optimization.cc
>> -               )
>> -
>>  endif()
>> +
>> +add_asan_test(AsanTest
>> +  ${ASAN_TEST_FILES}
>> +)
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20120629/1cad103d/attachment.html>