Move regression test into dedicated API regression folder

Author: NlightNFotis

.gitignore

@@ -65,6 +65,7 @@ regression/**/*.smt2
 regression/solver-hardness/solver-hardness-simple/solver_hardness.json
 jbmc/regression/**/tests.log
 jbmc/regression/**/tests-symex-driven-loading.log
+cprover-cpp-api/regression/**/tests.log
 
 # regression/coverage file
 /regression/coverage_**

CMakeLists.txt

@@ -206,7 +206,7 @@ option(WITH_MEMORY_ANALYZER
 add_subdirectory(src)
 add_subdirectory(regression)
 add_subdirectory(unit)
-add_subdirectory(cpp_api)
+add_subdirectory(cprover-cpp-api)
 
 cprover_default_properties(
     analyses

cprover-cpp-api/regression/CMakeLists.txt

@@ -10,3 +10,30 @@ target_include_directories(api-binary-driver
     ${CMAKE_CURRENT_SOURCE_DIR}/../src)
 target_link_libraries(api-binary-driver goto-programs util langapi ansi-c)
 
+# Enable test running
+set(test_pl_path "${CBMC_SOURCE_DIR}/../regression/test.pl")
+
+macro(add_test_pl_profile name cmdline flag profile)
+    add_test(
+        NAME "${name}-${profile}"
+        COMMAND perl ${test_pl_path} -e -p -c "${cmdline}" ${flag} ${ARGN}
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    )
+    set_tests_properties("${name}-${profile}" PROPERTIES
+        LABELS "${profile};CBMC"
+    )
+endmacro(add_test_pl_profile)
+
+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 ${ARGN})
+    add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -T THOROUGH ${ARGN})
+    add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -F FUTURE ${ARGN})
+    add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -K KNOWNBUG ${ARGN})
+endmacro(add_test_pl_tests)
+
+# For the best possible utilisation of multiple cores when
+# running tests in parallel, it is important that these directories are
+# listed with decreasing runtimes (i.e. longest running at the top)
+add_subdirectory(model_loading)

regression/cprover-api-cpp/CMakeLists.txt renamed to cprover-cpp-api/regression/model_loading/CMakeLists.txt

@@ -37,7 +37,6 @@ add_subdirectory(cbmc-concurrency)
 add_subdirectory(cbmc-cover)
 add_subdirectory(cbmc-incr-oneloop)
 add_subdirectory(cbmc-incr-smt2)
-add_subdirectory(cprover-api-cpp)
 add_subdirectory(cbmc-incr)
 add_subdirectory(cbmc-output-file)
 add_subdirectory(cbmc-with-incr)