From dc324e16444f42c3d2e1967ea5cfa6f081a9714c Mon Sep 17 00:00:00 2001
From: Alexey Samsonov <vonosmas@gmail.com>
Date: Tue, 21 Jul 2015 22:51:49 +0000
Subject: [PATCH] [Fuzzer] Clearly separate regular and DFSan tests. NFC.

llvm-svn: 242850
---
 llvm/lib/Fuzzer/test/CMakeLists.txt                                | 6 +++---
 llvm/lib/Fuzzer/test/{DFSanMemcmpTest.cpp => MemcmpTest.cpp}       | 0
 llvm/lib/Fuzzer/test/{DFSanSimpleCmpTest.cpp => SimpleCmpTest.cpp} | 0
 llvm/lib/Fuzzer/test/fuzzer-dfsan.test                             | 6 ++++++
 llvm/lib/Fuzzer/test/fuzzer.test                                   | 5 +----
 5 files changed, 10 insertions(+), 7 deletions(-)
 rename llvm/lib/Fuzzer/test/{DFSanMemcmpTest.cpp => MemcmpTest.cpp} (100%)
 rename llvm/lib/Fuzzer/test/{DFSanSimpleCmpTest.cpp => SimpleCmpTest.cpp} (100%)
 create mode 100644 llvm/lib/Fuzzer/test/fuzzer-dfsan.test

diff --git a/llvm/lib/Fuzzer/test/CMakeLists.txt b/llvm/lib/Fuzzer/test/CMakeLists.txt
index a9acec1..2769f6a 100644
--- a/llvm/lib/Fuzzer/test/CMakeLists.txt
+++ b/llvm/lib/Fuzzer/test/CMakeLists.txt
@@ -5,8 +5,8 @@
 set(CMAKE_CXX_FLAGS_RELEASE "${LIBFUZZER_FLAGS_BASE} -O0 -fsanitize-coverage=edge,indirect-calls")
 
 set(DFSanTests
-  DFSanMemcmpTest
-  DFSanSimpleCmpTest
+  MemcmpTest
+  SimpleCmpTest
   )
 
 set(Tests
@@ -16,9 +16,9 @@ set(Tests
   FullCoverageSetTest
   InfiniteTest
   NullDerefTest
+  SimpleCmpTest
   SimpleTest
   TimeoutTest
-  ${DFSanTests}
   )
 
 set(CustomMainTests
diff --git a/llvm/lib/Fuzzer/test/DFSanMemcmpTest.cpp b/llvm/lib/Fuzzer/test/MemcmpTest.cpp
similarity index 100%
rename from llvm/lib/Fuzzer/test/DFSanMemcmpTest.cpp
rename to llvm/lib/Fuzzer/test/MemcmpTest.cpp
diff --git a/llvm/lib/Fuzzer/test/DFSanSimpleCmpTest.cpp b/llvm/lib/Fuzzer/test/SimpleCmpTest.cpp
similarity index 100%
rename from llvm/lib/Fuzzer/test/DFSanSimpleCmpTest.cpp
rename to llvm/lib/Fuzzer/test/SimpleCmpTest.cpp
diff --git a/llvm/lib/Fuzzer/test/fuzzer-dfsan.test b/llvm/lib/Fuzzer/test/fuzzer-dfsan.test
new file mode 100644
index 0000000..79fbcbb
--- /dev/null
+++ b/llvm/lib/Fuzzer/test/fuzzer-dfsan.test
@@ -0,0 +1,6 @@
+CHECK: BINGO
+
+RUN: not ./LLVMFuzzer-SimpleCmpTest-DFSan -use_traces=1 -seed=1 -runs=1000000 -timeout=5 2>&1 | FileCheck %s
+
+RUN: not ./LLVMFuzzer-MemcmpTest-DFSan -use_traces=1 -seed=1 -runs=100 -timeout=5 2>&1 | FileCheck %s
+
diff --git a/llvm/lib/Fuzzer/test/fuzzer.test b/llvm/lib/Fuzzer/test/fuzzer.test
index b8e672f..ffd2f20 100644
--- a/llvm/lib/Fuzzer/test/fuzzer.test
+++ b/llvm/lib/Fuzzer/test/fuzzer.test
@@ -19,10 +19,7 @@ RUN: not ./LLVMFuzzer-FourIndependentBranchesTest -timeout=15 -seed=1 -use_full_
 
 RUN: not ./LLVMFuzzer-CounterTest -use_counters=1 -max_len=6 -seed=1 -timeout=15 2>&1 | FileCheck %s
 
-RUN: not ./LLVMFuzzer-DFSanSimpleCmpTest-DFSan -use_traces=1 -seed=1 -runs=1000000 -timeout=5 2>&1 | FileCheck %s
-RUN: not ./LLVMFuzzer-DFSanSimpleCmpTest -use_traces=1 -seed=1 -runs=1000000 -timeout=5 2>&1 | FileCheck %s
-
-RUN: not ./LLVMFuzzer-DFSanMemcmpTest-DFSan -use_traces=1 -seed=1 -runs=100 -timeout=5 2>&1 | FileCheck %s
+RUN: not ./LLVMFuzzer-SimpleCmpTest -use_traces=1 -seed=1 -runs=1000000 -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.7.4