Revision: 75833
http://sourceforge.net/p/brlcad/code/75833
Author: starseeker
Date: 2020-05-18 17:13:06 +0000 (Mon, 18 May 2020)
Log Message:
-----------
Add_Regression_Test can be a function rather than a macro
Modified Paths:
--------------
brlcad/trunk/regress/CMakeLists.txt
brlcad/trunk/regress/licenses/CMakeLists.txt
brlcad/trunk/regress/repository/CMakeLists.txt
Modified: brlcad/trunk/regress/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/CMakeLists.txt 2020-05-18 17:02:28 UTC (rev 75832)
+++ brlcad/trunk/regress/CMakeLists.txt 2020-05-18 17:13:06 UTC (rev 75833)
@@ -1,22 +1,40 @@
-macro(Add_Regression_Test testname depends_list)
- CMAKE_PARSE_ARGUMENTS(${testname} "EXCLUDE_FROM_REGRESS" "" "" ${ARGN})
- set_target_properties(regress-${testname} PROPERTIES FOLDER "BRL-CAD
Regression Tests")
- if(NOT ${testname}_EXCLUDE_FROM_REGRESS)
+function(Add_Regression_Test testname depends_list)
+
+ cmake_parse_arguments(${testname} "EXCLUDE_FROM_REGRESS" "" "" ${ARGN})
+
+ set_target_properties(regress-${testname} PROPERTIES
EXCLUDE_FROM_DEFAULT_BUILD 1)
+
+ if (NOT ${testname}_EXCLUDE_FROM_REGRESS)
+
+ # Make sure we at least get this into the regression test folder - local
+ # subdirectories may override this if they have more specific locations
+ # they want to use.
+ set_target_properties(regress-${testname} PROPERTIES FOLDER "BRL-CAD
Regression Tests/regress")
+
set_tests_properties(regress-${testname} PROPERTIES LABELS "Regression")
- else(NOT ${testname}_EXCLUDE_FROM_REGRESS)
+
+ else (NOT ${testname}_EXCLUDE_FROM_REGRESS)
+
+ set_target_properties(regress-${testname} PROPERTIES FOLDER "BRL-CAD
Regression Tests")
+
set_tests_properties(regress-${testname} PROPERTIES LABELS "NOT_WORKING")
- endif(NOT ${testname}_EXCLUDE_FROM_REGRESS)
- if(NOT "${depends_list}" STREQUAL "")
+
+ endif (NOT ${testname}_EXCLUDE_FROM_REGRESS)
+
+ # Set up dependencies for both regress and check
+ if (NOT "${depends_list}" STREQUAL "")
add_dependencies(regress ${depends_list})
- if(TARGET check)
+ if (TARGET check)
add_dependencies(check ${depends_list})
- endif(TARGET check)
- endif(NOT "${depends_list}" STREQUAL "")
- if(NOT BRLCAD_DISABLE_REGRESS_TIMEOUT)
+ endif (TARGET check)
+ endif (NOT "${depends_list}" STREQUAL "")
+
+ if (NOT BRLCAD_DISABLE_REGRESS_TIMEOUT)
set_tests_properties(regress-${testname} PROPERTIES TIMEOUT 300) # FIXME:
want <60
- endif(NOT BRLCAD_DISABLE_REGRESS_TIMEOUT)
-endmacro(Add_Regression_Test)
+ endif (NOT BRLCAD_DISABLE_REGRESS_TIMEOUT)
+endfunction(Add_Regression_Test)
+
# Define the toplevel regression target - unless specifically excluded
# via a macro argument, this should collect all regression targets.
include(ProcessorCount)
Modified: brlcad/trunk/regress/licenses/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/licenses/CMakeLists.txt 2020-05-18 17:02:28 UTC
(rev 75832)
+++ brlcad/trunk/regress/licenses/CMakeLists.txt 2020-05-18 17:13:06 UTC
(rev 75833)
@@ -29,7 +29,6 @@
-DL_LIST=${LICENSE_LIST} -DF_LIST=${ALL_FILES_LIST}
-P "${CMAKE_CURRENT_SOURCE_DIR}/regress-licenses.cmake"
)
-set_tests_properties(regress-licenses PROPERTIES LABELS "Regression")
if (CMAKE_CONFIGURATION_TYPES)
add_custom_target(regress-licenses COMMAND ${CMAKE_CTEST_COMMAND} -C
${CMAKE_CFG_INTDIR} -R ^regress-licenses --output-on-failure)
@@ -36,17 +35,15 @@
else (CMAKE_CONFIGURATION_TYPES)
add_custom_target(regress-licenses COMMAND ${CMAKE_CTEST_COMMAND} -R
^regress-licenses --output-on-failure)
endif (CMAKE_CONFIGURATION_TYPES)
-add_dependencies(regress-licenses repocheck)
-set_target_properties(regress-licenses PROPERTIES FOLDER "BRL-CAD Regression
Tests")
-set_target_properties(regress-licenses PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
-add_dependencies(regress regress-licenses)
-add_dependencies(check regress-licenses)
+Add_Regression_Test(licenses "lcheck")
+
CMAKEFILES(
CMakeLists.txt
licenses_check.cpp
regress-licenses.cmake
)
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/regress/repository/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/repository/CMakeLists.txt 2020-05-18 17:02:28 UTC
(rev 75832)
+++ brlcad/trunk/regress/repository/CMakeLists.txt 2020-05-18 17:13:06 UTC
(rev 75833)
@@ -21,7 +21,6 @@
-DB_DIR=${BRLCAD_SOURCE_DIR}
-P "${CMAKE_CURRENT_SOURCE_DIR}/regress-repository.cmake"
)
-set_tests_properties(regress-repository PROPERTIES LABELS "Regression")
if (CMAKE_CONFIGURATION_TYPES)
add_custom_target(regress-repository COMMAND ${CMAKE_CTEST_COMMAND} -C
${CMAKE_CFG_INTDIR} -R ^regress-repository --output-on-failure)
@@ -28,17 +27,15 @@
else (CMAKE_CONFIGURATION_TYPES)
add_custom_target(regress-repository COMMAND ${CMAKE_CTEST_COMMAND} -R
^regress-repository --output-on-failure)
endif (CMAKE_CONFIGURATION_TYPES)
-add_dependencies(regress-repository repocheck)
-set_target_properties(regress-repository PROPERTIES FOLDER "BRL-CAD Regression
Tests")
-set_target_properties(regress-repository PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD
1)
-add_dependencies(regress regress-repository)
-add_dependencies(check regress-repository)
+Add_Regression_Test(repository "repocheck")
+
CMAKEFILES(
CMakeLists.txt
repocheck.cpp
regress-repository.cmake
)
+
# Local Variables:
# tab-width: 8
# mode: cmake
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
