From 5ba2a0b8b07e307f3c7f9ec7a0e344e0166315fb Mon Sep 17 00:00:00 2001
From: Kostya Serebryany <kcc@google.com>
Date: Fri, 8 May 2015 21:45:19 +0000
Subject: [PATCH] [lib/Fuzzer] build tests that work well with dfsan also w/o
 dfsan

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@236909 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Fuzzer/test/CMakeLists.txt                     | 12 +++++++-----
 lib/Fuzzer/test/{dfsan => }/DFSanMemcmpTest.cpp    |  0
 lib/Fuzzer/test/{dfsan => }/DFSanSimpleCmpTest.cpp |  0
 lib/Fuzzer/test/dfsan/CMakeLists.txt               |  6 +++---
 lib/Fuzzer/test/fuzzer.test                        |  4 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)
 rename lib/Fuzzer/test/{dfsan => }/DFSanMemcmpTest.cpp (100%)
 rename lib/Fuzzer/test/{dfsan => }/DFSanSimpleCmpTest.cpp (100%)

diff --git a/lib/Fuzzer/test/CMakeLists.txt b/lib/Fuzzer/test/CMakeLists.txt
index 1080b30ec39..fc663883ea1 100644
--- a/lib/Fuzzer/test/CMakeLists.txt
+++ b/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/lib/Fuzzer/test/dfsan/DFSanMemcmpTest.cpp b/lib/Fuzzer/test/DFSanMemcmpTest.cpp
similarity index 100%
rename from lib/Fuzzer/test/dfsan/DFSanMemcmpTest.cpp
rename to lib/Fuzzer/test/DFSanMemcmpTest.cpp
diff --git a/lib/Fuzzer/test/dfsan/DFSanSimpleCmpTest.cpp b/lib/Fuzzer/test/DFSanSimpleCmpTest.cpp
similarity index 100%
rename from lib/Fuzzer/test/dfsan/DFSanSimpleCmpTest.cpp
rename to lib/Fuzzer/test/DFSanSimpleCmpTest.cpp
diff --git a/lib/Fuzzer/test/dfsan/CMakeLists.txt b/lib/Fuzzer/test/dfsan/CMakeLists.txt
index d1a140d6b50..2b49831fcdb 100644
--- a/lib/Fuzzer/test/dfsan/CMakeLists.txt
+++ b/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/lib/Fuzzer/test/fuzzer.test b/lib/Fuzzer/test/fuzzer.test
index 9006c4a706d..7d1908f6179 100644
--- a/lib/Fuzzer/test/fuzzer.test
+++ b/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
 
-- 
2.11.0