Merge pull request #3708 from ethereum/moveTestTools

Move test tools to the subdirectory test/tools and adjust CMakeLists

circle.yml

@@ -126,7 +126,7 @@ jobs:
           paths:
             - solc/solc
             - test/soltest
-            - test/solfuzzer
+            - test/tools/solfuzzer
 
   test_x86:
     docker:

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

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)

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"

test/tools/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_executable(solfuzzer fuzzer.cpp)
+target_link_libraries(solfuzzer PRIVATE libsolc evmasm ${Boost_PROGRAM_OPTIONS_LIBRARIES})