#3282 Update macro for test to avoid using same name as cmake built-i…

…n function. Signed-off-by: Gautier Bureau <gautier.bureau@gmail.com>
dynawo · Jun 19, 2024 · a533a12 · a533a12
1 parent b4193dc
commit a533a12
Show file tree

Hide file tree

Showing 36 changed files with 40 additions and 40 deletions.
diff --git a/dynawo/cmake/TestCoverage.cmake b/dynawo/cmake/TestCoverage.cmake
@@ -97,8 +97,8 @@ add_custom_target(reset-coverage
   COMMAND rm -f ${LCOV_OUTPUT_FILE}
   COMMAND ${CMAKE_COMMAND} -E make_directory ${GENHTML_OUTPUT_DIR})
 
-add_custom_target(tests-coverage
-  COMMENT "launch each unit test")
+add_custom_target(tests-coverage-run
+  COMMENT "launch each unit test for coverage")
 
 add_custom_target(export-coverage
   COMMAND ${GENHTML_PATH} ${GENHTML_OPTIONS} -o ${GENHTML_OUTPUT_DIR} ${LCOV_OUTPUT_FILE} )
diff --git a/dynawo/cmake/UnitTest.cmake b/dynawo/cmake/UnitTest.cmake
@@ -20,9 +20,9 @@ else()
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0")
 endif()
 
-function(add_test test-target)
-  add_dependencies(tests ${test-target})
+function(add_test_run test-target)
+  add_dependencies(tests-run ${test-target})
 endfunction()
 
-add_custom_target(tests
+add_custom_target(tests-run
   COMMENT "launch each unit test")
diff --git a/dynawo/sources/API/CRT/test/CMakeLists.txt b/dynawo/sources/API/CRT/test/CMakeLists.txt
@@ -40,5 +40,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/API/CRV/test/CMakeLists.txt b/dynawo/sources/API/CRV/test/CMakeLists.txt
@@ -44,5 +44,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/API/CSTR/test/CMakeLists.txt b/dynawo/sources/API/CSTR/test/CMakeLists.txt
@@ -41,5 +41,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/API/DYD/test/CMakeLists.txt b/dynawo/sources/API/DYD/test/CMakeLists.txt
@@ -53,5 +53,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/API/EXTVAR/test/CMakeLists.txt b/dynawo/sources/API/EXTVAR/test/CMakeLists.txt
@@ -40,5 +40,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/API/FSV/test/CMakeLists.txt b/dynawo/sources/API/FSV/test/CMakeLists.txt
@@ -40,5 +40,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/API/JOB/test/CMakeLists.txt b/dynawo/sources/API/JOB/test/CMakeLists.txt
@@ -60,5 +60,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/API/LEQ/test/CMakeLists.txt b/dynawo/sources/API/LEQ/test/CMakeLists.txt
@@ -42,5 +42,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/API/PAR/test/CMakeLists.txt b/dynawo/sources/API/PAR/test/CMakeLists.txt
@@ -45,5 +45,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/API/TL/test/CMakeLists.txt b/dynawo/sources/API/TL/test/CMakeLists.txt
@@ -41,5 +41,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Common/test/CMakeLists.txt b/dynawo/sources/Common/test/CMakeLists.txt
@@ -48,5 +48,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Modeler/Common/test/CMakeLists.txt b/dynawo/sources/Modeler/Common/test/CMakeLists.txt
@@ -61,5 +61,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Modeler/DataInterface/PowSyblIIDM/test/CMakeLists.txt b/dynawo/sources/Modeler/DataInterface/PowSyblIIDM/test/CMakeLists.txt
@@ -65,5 +65,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Modeler/DataInterface/test/CMakeLists.txt b/dynawo/sources/Modeler/DataInterface/test/CMakeLists.txt
@@ -40,5 +40,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Modeler/ModelManager/test/CMakeLists.txt b/dynawo/sources/Modeler/ModelManager/test/CMakeLists.txt
@@ -57,5 +57,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Modeler/util/test/CMakeLists.txt b/dynawo/sources/Modeler/util/test/CMakeLists.txt
@@ -59,5 +59,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/ModelicaCompiler/test/CMakeLists.txt b/dynawo/sources/ModelicaCompiler/test/CMakeLists.txt
@@ -53,5 +53,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Models/CPP/Components/ModelLoadRestorativeWithLimits/test/CMakeLists.txt b/dynawo/sources/Models/CPP/Components/ModelLoadRestorativeWithLimits/test/CMakeLists.txt
@@ -35,5 +35,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/...urces/Models/CPP/Controls/Shunts/ModelCentralizedShuntsSectionControl/test/CMakeLists.txt b/...urces/Models/CPP/Controls/Shunts/ModelCentralizedShuntsSectionControl/test/CMakeLists.txt
@@ -35,5 +35,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/...sources/Models/CPP/Controls/Voltage/ModelVoltageMeasurementsUtilities/test/CMakeLists.txt b/...sources/Models/CPP/Controls/Voltage/ModelVoltageMeasurementsUtilities/test/CMakeLists.txt
@@ -35,5 +35,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Models/CPP/Events/ModelAreaShedding/test/CMakeLists.txt b/dynawo/sources/Models/CPP/Events/ModelAreaShedding/test/CMakeLists.txt
@@ -40,5 +40,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Models/CPP/Events/ModelVariationArea/test/CMakeLists.txt b/dynawo/sources/Models/CPP/Events/ModelVariationArea/test/CMakeLists.txt
@@ -40,5 +40,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Models/CPP/Events/ModelVoltageSetPointChange/test/CMakeLists.txt b/dynawo/sources/Models/CPP/Events/ModelVoltageSetPointChange/test/CMakeLists.txt
@@ -41,5 +41,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Models/CPP/ModelFrequency/ModelOmegaRef/test/CMakeLists.txt b/dynawo/sources/Models/CPP/ModelFrequency/ModelOmegaRef/test/CMakeLists.txt
@@ -35,5 +35,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Models/CPP/ModelNetwork/test/CMakeLists.txt b/dynawo/sources/Models/CPP/ModelNetwork/test/CMakeLists.txt
@@ -58,5 +58,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Models/Modelica/PreassembledModels/test/CMakeLists.txt b/dynawo/sources/Models/Modelica/PreassembledModels/test/CMakeLists.txt
@@ -39,5 +39,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Models/test/CMakeLists.txt b/dynawo/sources/Models/test/CMakeLists.txt
@@ -39,5 +39,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Solvers/AlgebraicSolvers/test/CMakeLists.txt b/dynawo/sources/Solvers/AlgebraicSolvers/test/CMakeLists.txt
@@ -66,5 +66,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Solvers/Common/test/CMakeLists.txt b/dynawo/sources/Solvers/Common/test/CMakeLists.txt
@@ -35,5 +35,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Solvers/FixedTimeStep/SolverSIM/test/CMakeLists.txt b/dynawo/sources/Solvers/FixedTimeStep/SolverSIM/test/CMakeLists.txt
@@ -69,5 +69,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Solvers/FixedTimeStep/SolverTRAP/test/CMakeLists.txt b/dynawo/sources/Solvers/FixedTimeStep/SolverTRAP/test/CMakeLists.txt
@@ -68,5 +68,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Solvers/VariableTimeStep/SolverIDA/test/CMakeLists.txt b/dynawo/sources/Solvers/VariableTimeStep/SolverIDA/test/CMakeLists.txt
@@ -67,5 +67,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/dynawo/sources/Solvers/util/test/CMakeLists.txt b/dynawo/sources/Solvers/util/test/CMakeLists.txt
@@ -43,5 +43,5 @@ if(BUILD_TESTS_COVERAGE)
 endif()
 
 if(BUILD_TESTS)
-  add_test(${MODULE_NAME}-tests)
+  add_test_run(${MODULE_NAME}-tests)
 endif()
diff --git a/util/envDynawo.sh b/util/envDynawo.sh
@@ -1041,7 +1041,7 @@ build_tests() {
 
   tests=$@
   if [ -z "$tests" ]; then
-    cmake --build $DYNAWO_BUILD_DIR --target tests --config Debug
+    cmake --build $DYNAWO_BUILD_DIR --target tests-run --config Debug
   else
     cmake --build $DYNAWO_BUILD_DIR --target ${tests} --config Debug
   fi
@@ -1105,7 +1105,7 @@ build_tests_coverage() {
 
   cmake --build $DYNAWO_BUILD_DIR --target reset-coverage --config Debug || error_exit "Error during make reset-coverage."
   if [ -z "$tests" ]; then
-    cmake --build $DYNAWO_BUILD_DIR --target tests-coverage --config Debug || error_exit "Error during make tests-coverage."
+    cmake --build $DYNAWO_BUILD_DIR --target tests-coverage-run --config Debug || error_exit "Error during make tests-coverage."
   else
     for test in ${tests}; do
       cmake --build $DYNAWO_BUILD_DIR --target ${test}-coverage --config Debug || error_exit "Error during make ${test}-coverage."