From 121f87b043d7c3f01c760589edf1bf342d67c634 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 12 Mar 2018 14:13:19 +0100
Subject: [PATCH] Move test tools to the subdirectory test/tools and adjust
 CMakeLists.txt.

---
 circle.yml                  |  2 +-
 scripts/uniqueErrors.sh     |  2 +-
 test/CMakeLists.txt         | 30 ++++++++++++++++++++++++------
 test/cmdlineTests.sh        |  4 ++--
 test/tools/CMakeLists.txt   |  2 ++
 test/{ => tools}/fuzzer.cpp |  0
 6 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 test/tools/CMakeLists.txt
 rename test/{ => tools}/fuzzer.cpp (100%)

diff --git a/circle.yml b/circle.yml
index 263cb700e..49c73ce4d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -126,7 +126,7 @@ jobs:
           paths:
             - solc/solc
             - test/soltest
-            - test/solfuzzer
+            - test/tools/solfuzzer
 
   test_x86:
     docker:
diff --git a/scripts/uniqueErrors.sh b/scripts/uniqueErrors.sh
index eee1df903..fa2c7b4c0 100755
--- a/scripts/uniqueErrors.sh
+++ b/scripts/uniqueErrors.sh
@@ -9,6 +9,6 @@ do
   echo -n $x " # "
   # This subshell is a workaround to prevent the shell from printing
   # "Aborted"
-  ("$REPO"/build/test/solfuzzer < "$x" || true) 2>&1 | head -n 1
+  ("$REPO"/build/test/tools/solfuzzer < "$x" || true) 2>&1 | head -n 1
 done
 ) | sort -u -t'#' -k 2
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f36ad4c53..522856cc7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,9 +1,27 @@
-file(GLOB_RECURSE sources "*.cpp")
-list(REMOVE_ITEM sources "${CMAKE_CURRENT_SOURCE_DIR}/fuzzer.cpp")
-file(GLOB_RECURSE headers "*.h")
+file(GLOB sources "*.cpp")
+file(GLOB headers "*.h")
 
-add_executable(soltest ${sources} ${headers})
+file(GLOB contracts_sources "contracts/*.cpp")
+file(GLOB contracts_headers "contracts/*.h")
+file(GLOB libdevcore_sources "libdevcore/*.cpp")
+file(GLOB libdevcore_headers "libdevcore/*.h")
+file(GLOB libevmasm_sources "libevmasm/*.cpp")
+file(GLOB libevmasm_headers "libevmasm/*.h")
+file(GLOB libjulia_sources "libjulia/*.cpp")
+file(GLOB libjulia_headers "libjulia/*.h")
+file(GLOB liblll_sources "liblll/*.cpp")
+file(GLOB liblll_headers "liblll/*.h")
+file(GLOB libsolidity_sources "libsolidity/*.cpp")
+file(GLOB libsolidity_headers "libsolidity/*.h")
+
+add_executable(soltest ${sources} ${headers}
+    ${contracts_sources} ${contracts_headers}
+    ${libdevcore_sources} ${libdevcore_headers}
+    ${libevmasm_sources} ${libevmasm_headers}
+    ${libjulia_sources} ${libjulia_headers}
+    ${liblll_sources} ${liblll_headers}
+    ${libsolidity_sources} ${libsolidity_headers}
+)
 target_link_libraries(soltest PRIVATE libsolc solidity lll evmasm devcore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
 
-add_executable(solfuzzer fuzzer.cpp)
-target_link_libraries(solfuzzer PRIVATE libsolc evmasm ${Boost_PROGRAM_OPTIONS_LIBRARIES})
+add_subdirectory(tools)
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index e86e0ad48..92f9569a1 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -170,14 +170,14 @@ TMPDIR=$(mktemp -d)
     for f in *.sol
     do
         set +e
-        "$REPO_ROOT"/build/test/solfuzzer --quiet < "$f"
+        "$REPO_ROOT"/build/test/tools/solfuzzer --quiet < "$f"
         if [ $? -ne 0 ]; then
             printError "Fuzzer failed on:"
             cat "$f"
             exit 1
         fi
 
-        "$REPO_ROOT"/build/test/solfuzzer --without-optimizer --quiet < "$f"
+        "$REPO_ROOT"/build/test/tools/solfuzzer --without-optimizer --quiet < "$f"
         if [ $? -ne 0 ]; then
             printError "Fuzzer (without optimizer) failed on:"
             cat "$f"
diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
new file mode 100644
index 000000000..a693ebab4
--- /dev/null
+++ b/test/tools/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_executable(solfuzzer fuzzer.cpp)
+target_link_libraries(solfuzzer PRIVATE libsolc evmasm ${Boost_PROGRAM_OPTIONS_LIBRARIES})
diff --git a/test/fuzzer.cpp b/test/tools/fuzzer.cpp
similarity index 100%
rename from test/fuzzer.cpp
rename to test/tools/fuzzer.cpp