From 413fc1b53e9f358c27e698a08a0f265880efee43 Mon Sep 17 00:00:00 2001 From: reuk Date: Wed, 20 Sep 2017 14:36:59 +0100 Subject: [PATCH] Automatically deduce test names from dir names --- regression/CMakeLists.txt | 12 +++++++----- regression/ansi-c/CMakeLists.txt | 1 - regression/cbmc-java-inheritance/CMakeLists.txt | 1 - regression/cbmc-java/CMakeLists.txt | 1 - regression/cbmc/CMakeLists.txt | 1 - regression/cpp/CMakeLists.txt | 1 - regression/goto-analyzer/CMakeLists.txt | 1 - regression/goto-cc-cbmc/CMakeLists.txt | 1 - regression/goto-cc-goto-analyzer/CMakeLists.txt | 1 - regression/goto-diff/CMakeLists.txt | 1 - regression/goto-instrument-typedef/CMakeLists.txt | 1 - regression/goto-instrument/CMakeLists.txt | 1 - regression/invariants/CMakeLists.txt | 1 - regression/strings-smoke-tests/CMakeLists.txt | 1 - regression/strings/CMakeLists.txt | 1 - regression/test-script/CMakeLists.txt | 1 - 16 files changed, 7 insertions(+), 20 deletions(-) diff --git a/regression/CMakeLists.txt b/regression/CMakeLists.txt index 3d9bb16e741..79ae5d70a12 100644 --- a/regression/CMakeLists.txt +++ b/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) diff --git a/regression/ansi-c/CMakeLists.txt b/regression/ansi-c/CMakeLists.txt index 027ec188f71..bc92a35412f 100644 --- a/regression/ansi-c/CMakeLists.txt +++ b/regression/ansi-c/CMakeLists.txt @@ -1,4 +1,3 @@ add_test_pl_tests( - "ansi-c" "$" ) diff --git a/regression/cbmc-java-inheritance/CMakeLists.txt b/regression/cbmc-java-inheritance/CMakeLists.txt index cf949e080b8..93d5ee716c2 100644 --- a/regression/cbmc-java-inheritance/CMakeLists.txt +++ b/regression/cbmc-java-inheritance/CMakeLists.txt @@ -1,4 +1,3 @@ add_test_pl_tests( - "cbmc-java-inheritance" "$" ) diff --git a/regression/cbmc-java/CMakeLists.txt b/regression/cbmc-java/CMakeLists.txt index 37252add85e..93d5ee716c2 100644 --- a/regression/cbmc-java/CMakeLists.txt +++ b/regression/cbmc-java/CMakeLists.txt @@ -1,4 +1,3 @@ add_test_pl_tests( - "cbmc-java" "$" ) diff --git a/regression/cbmc/CMakeLists.txt b/regression/cbmc/CMakeLists.txt index ee9f8f2e90f..93d5ee716c2 100644 --- a/regression/cbmc/CMakeLists.txt +++ b/regression/cbmc/CMakeLists.txt @@ -1,4 +1,3 @@ add_test_pl_tests( - "cbmc" "$" ) diff --git a/regression/cpp/CMakeLists.txt b/regression/cpp/CMakeLists.txt index c6eea89555b..bc92a35412f 100644 --- a/regression/cpp/CMakeLists.txt +++ b/regression/cpp/CMakeLists.txt @@ -1,4 +1,3 @@ add_test_pl_tests( - "cpp" "$" ) diff --git a/regression/goto-analyzer/CMakeLists.txt b/regression/goto-analyzer/CMakeLists.txt index 3d5daac5b92..73af8689568 100644 --- a/regression/goto-analyzer/CMakeLists.txt +++ b/regression/goto-analyzer/CMakeLists.txt @@ -1,4 +1,3 @@ add_test_pl_tests( - "goto-analyzer" "$" ) diff --git a/regression/goto-cc-cbmc/CMakeLists.txt b/regression/goto-cc-cbmc/CMakeLists.txt index 258e36f94a0..53647ddb692 100644 --- a/regression/goto-cc-cbmc/CMakeLists.txt +++ b/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 $ $ ${is_windows}" ) diff --git a/regression/goto-cc-goto-analyzer/CMakeLists.txt b/regression/goto-cc-goto-analyzer/CMakeLists.txt index e10f2aace47..70ebee30c6e 100644 --- a/regression/goto-cc-goto-analyzer/CMakeLists.txt +++ b/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 $ $ ${is_windows}" ) diff --git a/regression/goto-diff/CMakeLists.txt b/regression/goto-diff/CMakeLists.txt index 9f0957a1386..e55a44d8003 100644 --- a/regression/goto-diff/CMakeLists.txt +++ b/regression/goto-diff/CMakeLists.txt @@ -1,4 +1,3 @@ add_test_pl_tests( - "goto-diff" "$" ) diff --git a/regression/goto-instrument-typedef/CMakeLists.txt b/regression/goto-instrument-typedef/CMakeLists.txt index 63a842ccec9..8b1e4b6ca39 100644 --- a/regression/goto-instrument-typedef/CMakeLists.txt +++ b/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 $ $ ${is_windows}" ) diff --git a/regression/goto-instrument/CMakeLists.txt b/regression/goto-instrument/CMakeLists.txt index 088fcab9651..f7f08694f6a 100644 --- a/regression/goto-instrument/CMakeLists.txt +++ b/regression/goto-instrument/CMakeLists.txt @@ -5,6 +5,5 @@ else() endif() add_test_pl_tests( - "goto-instrument" "${CMAKE_CURRENT_SOURCE_DIR}/chain.sh $ $ $ ${is_windows}" ) diff --git a/regression/invariants/CMakeLists.txt b/regression/invariants/CMakeLists.txt index 467e2b13950..6e788e13330 100644 --- a/regression/invariants/CMakeLists.txt +++ b/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" "$" ) diff --git a/regression/strings-smoke-tests/CMakeLists.txt b/regression/strings-smoke-tests/CMakeLists.txt index 6e8a19a9796..93d5ee716c2 100644 --- a/regression/strings-smoke-tests/CMakeLists.txt +++ b/regression/strings-smoke-tests/CMakeLists.txt @@ -1,4 +1,3 @@ add_test_pl_tests( - "strings-smoke-test" "$" ) diff --git a/regression/strings/CMakeLists.txt b/regression/strings/CMakeLists.txt index 846e65ae00d..93d5ee716c2 100644 --- a/regression/strings/CMakeLists.txt +++ b/regression/strings/CMakeLists.txt @@ -1,4 +1,3 @@ add_test_pl_tests( - "strings" "$" ) diff --git a/regression/test-script/CMakeLists.txt b/regression/test-script/CMakeLists.txt index 00ad3a848d6..b39f04a240b 100644 --- a/regression/test-script/CMakeLists.txt +++ b/regression/test-script/CMakeLists.txt @@ -1,4 +1,3 @@ add_test_pl_tests( - "test-script" "${CMAKE_CURRENT_SOURCE_DIR}/program_runner.sh" )