Fix names of unit tests (#8338)

We are generally converging to tests names that are identical to their file name relative to the test directory, making running a particular subset of tests via ctest -R reasonably easy. This PR makes sure that the tests in unit/api/cpp also adhere to this schema.

diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 0dc902f13d7c26454ec2f74330b60500e790b5f2..12ef8998315b355dbe1445a2796b404505e0506b 100644 (file)
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -73,11 +73,7 @@ macro(cvc5_add_unit_test is_white name output_dir)
     if("${output_dir}" STREQUAL "")
       set(test_name unit/${name})
     else()
-      if("${output_dir}" STREQUAL "api")
-        set(test_name unit/${output_dir}/cpp/${name})
-      else()
-        set(test_name unit/${output_dir}/${name})
-      endif()
+      set(test_name unit/${output_dir}/${name})
     endif()
     add_test(${test_name} ${test_bin_dir}/${name})
     set_tests_properties(${test_name} PROPERTIES LABELS "unit")

diff --git a/test/unit/api/cpp/CMakeLists.txt b/test/unit/api/cpp/CMakeLists.txt
index 919f2eafbeac39ec48cbeb7d0b54d2048ac3c951..d356236be417927f84b4027cf1bc13393b002226 100644 (file)
--- a/test/unit/api/cpp/CMakeLists.txt
+++ b/test/unit/api/cpp/CMakeLists.txt
@@ -12,17 +12,17 @@
 #
 # The build system configuration.
 ##
-cvc5_add_unit_test_black(datatype_api_black api)
-cvc5_add_unit_test_black(grammar_black api)
-cvc5_add_unit_test_black(api_kind_black api)
-cvc5_add_unit_test_black(op_black api)
-cvc5_add_unit_test_black(parametric_datatype_black api)
-cvc5_add_unit_test_black(result_black api)
-cvc5_add_unit_test_black(solver_black api)
-cvc5_add_unit_test_black(sort_black api)
-cvc5_add_unit_test_black(term_black api)
-cvc5_add_unit_test_black(theory_arith_nl_black api)
-cvc5_add_unit_test_black(theory_uf_ho_black api)
-cvc5_add_unit_test_white(op_white api)
-cvc5_add_unit_test_white(solver_white api)
-cvc5_add_unit_test_white(term_white api)
+cvc5_add_unit_test_black(datatype_api_black api/cpp)
+cvc5_add_unit_test_black(grammar_black api/cpp)
+cvc5_add_unit_test_black(api_kind_black api/cpp)
+cvc5_add_unit_test_black(op_black api/cpp)
+cvc5_add_unit_test_black(parametric_datatype_black api/cpp)
+cvc5_add_unit_test_black(result_black api/cpp)
+cvc5_add_unit_test_black(solver_black api/cpp)
+cvc5_add_unit_test_black(sort_black api/cpp)
+cvc5_add_unit_test_black(term_black api/cpp)
+cvc5_add_unit_test_black(theory_arith_nl_black api/cpp)
+cvc5_add_unit_test_black(theory_uf_ho_black api/cpp)
+cvc5_add_unit_test_white(op_white api/cpp)
+cvc5_add_unit_test_white(solver_white api/cpp)
+cvc5_add_unit_test_white(term_white api/cpp)