diff options
| author | Kostya Serebryany <kcc@google.com> | 2015-05-08 21:45:19 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2015-05-08 21:45:19 +0000 |
| commit | f3f3ed323acae3e4a6a558d8fa338c717ad5db58 (patch) | |
| tree | fd2fe12d73d4506519632eafcff36c945a1b6f57 | |
| parent | a7046002959f3e1fad47b028b51756084934934c (diff) | |
| download | bcm5719-llvm-f3f3ed323acae3e4a6a558d8fa338c717ad5db58.tar.gz bcm5719-llvm-f3f3ed323acae3e4a6a558d8fa338c717ad5db58.zip | |
[lib/Fuzzer] build tests that work well with dfsan also w/o dfsan
llvm-svn: 236909
| -rw-r--r-- | llvm/lib/Fuzzer/test/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | llvm/lib/Fuzzer/test/DFSanMemcmpTest.cpp (renamed from llvm/lib/Fuzzer/test/dfsan/DFSanMemcmpTest.cpp) | 0 | ||||
| -rw-r--r-- | llvm/lib/Fuzzer/test/DFSanSimpleCmpTest.cpp (renamed from llvm/lib/Fuzzer/test/dfsan/DFSanSimpleCmpTest.cpp) | 0 | ||||
| -rw-r--r-- | llvm/lib/Fuzzer/test/dfsan/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | llvm/lib/Fuzzer/test/fuzzer.test | 4 |
5 files changed, 12 insertions, 10 deletions
diff --git a/llvm/lib/Fuzzer/test/CMakeLists.txt b/llvm/lib/Fuzzer/test/CMakeLists.txt index 1080b30ec39..fc663883ea1 100644 --- a/llvm/lib/Fuzzer/test/CMakeLists.txt +++ b/llvm/lib/Fuzzer/test/CMakeLists.txt @@ -4,6 +4,11 @@ # for the Fuzzer lib) set(CMAKE_CXX_FLAGS_RELEASE "${LIBFUZZER_FLAGS_BASE} -O0 -fsanitize-coverage=edge,indirect-calls") +set(DFSanTests + DFSanMemcmpTest + DFSanSimpleCmpTest + ) + set(Tests CounterTest CxxTokensTest @@ -13,12 +18,9 @@ set(Tests NullDerefTest SimpleTest TimeoutTest + ${DFSanTests} ) -set(DFSanTests - DFSanMemcmpTest - DFSanSimpleCmpTest - ) set(TestBinaries) @@ -60,7 +62,7 @@ set(TestBinaries ${TestBinaries} LLVMFuzzer-Unittest) add_subdirectory(dfsan) foreach(Test ${DFSanTests}) - set(TestBinaries ${TestBinaries} LLVMFuzzer-${Test}) + set(TestBinaries ${TestBinaries} LLVMFuzzer-${Test}-DFSan) endforeach() diff --git a/llvm/lib/Fuzzer/test/dfsan/DFSanMemcmpTest.cpp b/llvm/lib/Fuzzer/test/DFSanMemcmpTest.cpp index 510a2439800..510a2439800 100644 --- a/llvm/lib/Fuzzer/test/dfsan/DFSanMemcmpTest.cpp +++ b/llvm/lib/Fuzzer/test/DFSanMemcmpTest.cpp diff --git a/llvm/lib/Fuzzer/test/dfsan/DFSanSimpleCmpTest.cpp b/llvm/lib/Fuzzer/test/DFSanSimpleCmpTest.cpp index ee378146dae..ee378146dae 100644 --- a/llvm/lib/Fuzzer/test/dfsan/DFSanSimpleCmpTest.cpp +++ b/llvm/lib/Fuzzer/test/DFSanSimpleCmpTest.cpp diff --git a/llvm/lib/Fuzzer/test/dfsan/CMakeLists.txt b/llvm/lib/Fuzzer/test/dfsan/CMakeLists.txt index d1a140d6b50..2b49831fcdb 100644 --- a/llvm/lib/Fuzzer/test/dfsan/CMakeLists.txt +++ b/llvm/lib/Fuzzer/test/dfsan/CMakeLists.txt @@ -4,10 +4,10 @@ set(CMAKE_CXX_FLAGS_RELEASE "${LIBFUZZER_FLAGS_BASE} -O0 -fno-sanitize=all -fsanitize=dataflow") foreach(Test ${DFSanTests}) - add_executable(LLVMFuzzer-${Test} - ${Test}.cpp + add_executable(LLVMFuzzer-${Test}-DFSan + ../${Test}.cpp ) - target_link_libraries(LLVMFuzzer-${Test} + target_link_libraries(LLVMFuzzer-${Test}-DFSan LLVMFuzzer ) endforeach() diff --git a/llvm/lib/Fuzzer/test/fuzzer.test b/llvm/lib/Fuzzer/test/fuzzer.test index 9006c4a706d..7d1908f6179 100644 --- a/llvm/lib/Fuzzer/test/fuzzer.test +++ b/llvm/lib/Fuzzer/test/fuzzer.test @@ -19,9 +19,9 @@ RUN: not ./LLVMFuzzer-FourIndependentBranchesTest -timeout=15 -seed=1 -use_cover RUN: not ./LLVMFuzzer-CounterTest -use_counters=1 -max_len=6 -seed=1 -timeout=15 2>&1 | FileCheck %s -RUN: not ./LLVMFuzzer-DFSanSimpleCmpTest -seed=1 -runs=1000000 -timeout=5 2>&1 | FileCheck %s +RUN: not ./LLVMFuzzer-DFSanSimpleCmpTest-DFSan -seed=1 -runs=1000000 -timeout=5 2>&1 | FileCheck %s -RUN: not ./LLVMFuzzer-DFSanMemcmpTest -seed=1 -runs=100 -timeout=5 2>&1 | FileCheck %s +RUN: not ./LLVMFuzzer-DFSanMemcmpTest-DFSan -seed=1 -runs=100 -timeout=5 2>&1 | FileCheck %s RUN: not ./LLVMFuzzer-CxxTokensTest -seed=1 -timeout=15 -tokens=%S/../cxx_fuzzer_tokens.txt 2>&1 | FileCheck %s |
