Merge pull request diffblue#1408 from reuk/reuk/regression-filenames

Automatically deduce test names from dir names

Author: Thomas Kiley

regression/CMakeLists.txt

@@ -14,11 +14,13 @@ macro(add_test_pl_profile name cmdline flag profile)
     )
 endmacro(add_test_pl_profile)
 
-macro(add_test_pl_tests name cmdline)
-    add_test_pl_profile("${name}" "${cmdline}" -C CORE)
-    add_test_pl_profile("${name}" "${cmdline}" -T THOROUGH)
-    add_test_pl_profile("${name}" "${cmdline}" -F FUTURE)
-    add_test_pl_profile("${name}" "${cmdline}" -K KNOWNBUG)
+macro(add_test_pl_tests cmdline)
+    get_filename_component(TEST_DIR_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+    message(STATUS "Adding tests in directory: ${TEST_DIR_NAME}")
+    add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -C CORE)
+    add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -T THOROUGH)
+    add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -F FUTURE)
+    add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -K KNOWNBUG)
 endmacro(add_test_pl_tests)
 
 add_subdirectory(ansi-c)

regression/ansi-c/CMakeLists.txt

@@ -1,4 +1,3 @@
 add_test_pl_tests(
-    "ansi-c"
     "$<TARGET_FILE:goto-cc>"
 )

regression/cbmc-java-inheritance/CMakeLists.txt

@@ -1,4 +1,3 @@
 add_test_pl_tests(
-    "cbmc-java-inheritance"
     "$<TARGET_FILE:cbmc>"
 )

regression/cbmc-java/CMakeLists.txt

@@ -1,4 +1,3 @@
 add_test_pl_tests(
-    "cbmc-java"
     "$<TARGET_FILE:cbmc>"
 )

regression/cbmc/CMakeLists.txt

@@ -1,4 +1,3 @@
 add_test_pl_tests(
-    "cbmc"
     "$<TARGET_FILE:cbmc>"
 )

regression/cpp/CMakeLists.txt

@@ -1,4 +1,3 @@
 add_test_pl_tests(
-    "cpp"
     "$<TARGET_FILE:goto-cc>"
 )

regression/goto-analyzer/CMakeLists.txt

@@ -1,4 +1,3 @@
 add_test_pl_tests(
-    "goto-analyzer"
     "$<TARGET_FILE:goto-analyzer>"
 )

regression/goto-cc-cbmc/CMakeLists.txt

@@ -5,6 +5,5 @@ else()
 endif()
 
 add_test_pl_tests(
-    "goto-cc-cbmc"
     "${CMAKE_CURRENT_SOURCE_DIR}/chain.sh $<TARGET_FILE:goto-cc> $<TARGET_FILE:cbmc> ${is_windows}"
 )

regression/goto-cc-goto-analyzer/CMakeLists.txt

@@ -5,6 +5,5 @@ else()
 endif()
 
 add_test_pl_tests(
-    "goto-cc-goto-analyzer"
     "${CMAKE_CURRENT_SOURCE_DIR}/chain.sh $<TARGET_FILE:goto-cc> $<TARGET_FILE:goto-analyzer> ${is_windows}"
 )

regression/goto-diff/CMakeLists.txt

@@ -1,4 +1,3 @@
 add_test_pl_tests(
-    "goto-diff"
     "$<TARGET_FILE:goto-diff>"
 )

regression/goto-instrument-typedef/CMakeLists.txt

@@ -5,6 +5,5 @@ else()
 endif()
 
 add_test_pl_tests(
-    "goto-instrument-typedef"
     "${CMAKE_CURRENT_SOURCE_DIR}/chain.sh $<TARGET_FILE:goto-cc> $<TARGET_FILE:goto-instrument> ${is_windows}"
 )

regression/goto-instrument/CMakeLists.txt

@@ -5,6 +5,5 @@ else()
 endif()
 
 add_test_pl_tests(
-    "goto-instrument"
     "${CMAKE_CURRENT_SOURCE_DIR}/chain.sh $<TARGET_FILE:goto-cc> $<TARGET_FILE:goto-instrument> $<TARGET_FILE:cbmc> ${is_windows}"
 )

regression/invariants/CMakeLists.txt

@@ -2,6 +2,5 @@ add_executable(driver driver.cpp)
 target_link_libraries(driver big-int util)
 
 add_test_pl_tests(
-    "invariants"
     "$<TARGET_FILE:driver>"
 )

regression/strings-smoke-tests/CMakeLists.txt

@@ -1,4 +1,3 @@
 add_test_pl_tests(
-    "strings-smoke-test"
     "$<TARGET_FILE:cbmc>"
 )

regression/strings/CMakeLists.txt

@@ -1,4 +1,3 @@
 add_test_pl_tests(
-    "strings"
     "$<TARGET_FILE:cbmc>"
 )

regression/test-script/CMakeLists.txt

@@ -1,4 +1,3 @@
 add_test_pl_tests(
-    "test-script"
     "${CMAKE_CURRENT_SOURCE_DIR}/program_runner.sh" 
 )