Revision: 77600
http://sourceforge.net/p/brlcad/code/77600
Author: starseeker
Date: 2020-10-23 13:47:21 +0000 (Fri, 23 Oct 2020)
Log Message:
-----------
ws
Modified Paths:
--------------
brlcad/branches/extbuild/misc/CMake/BRLCAD_Test_Wrappers.cmake
Modified: brlcad/branches/extbuild/misc/CMake/BRLCAD_Test_Wrappers.cmake
===================================================================
--- brlcad/branches/extbuild/misc/CMake/BRLCAD_Test_Wrappers.cmake
2020-10-23 13:46:07 UTC (rev 77599)
+++ brlcad/branches/extbuild/misc/CMake/BRLCAD_Test_Wrappers.cmake
2020-10-23 13:47:21 UTC (rev 77600)
@@ -1,39 +1,39 @@
# "make check" runs all of the tests (unit, benchmark, and regression) that
are expected to work.
- include(ProcessorCount)
+include(ProcessorCount)
ProcessorCount(N)
- if(NOT N EQUAL 0)
- math(EXPR NC "${N} / 2")
- if(${NC} GREATER 1)
- set(JFLAG "-j${NC}")
- else(${NC} GREATER 1)
- set(JFLAG)
- endif(${NC} GREATER 1)
- else(NOT N EQUAL 0)
- # Huh? No j flag if we can't get a processor count
- set(JFLAG)
- endif(NOT N EQUAL 0)
+if(NOT N EQUAL 0)
+ math(EXPR NC "${N} / 2")
+ if(${NC} GREATER 1)
+ set(JFLAG "-j${NC}")
+ else(${NC} GREATER 1)
+ set(JFLAG)
+ endif(${NC} GREATER 1)
+else(NOT N EQUAL 0)
+ # Huh? No j flag if we can't get a processor count
+ set(JFLAG)
+endif(NOT N EQUAL 0)
- if(CMAKE_CONFIGURATION_TYPES)
- set(CONFIG $<CONFIG>)
- else(CMAKE_CONFIGURATION_TYPES)
- if ("${CONFIG}" STREQUAL "")
- set(CONFIG "\"\"")
- endif ("${CONFIG}" STREQUAL "")
- endif(CMAKE_CONFIGURATION_TYPES)
+if(CMAKE_CONFIGURATION_TYPES)
+ set(CONFIG $<CONFIG>)
+else(CMAKE_CONFIGURATION_TYPES)
+ if ("${CONFIG}" STREQUAL "")
+ set(CONFIG "\"\"")
+ endif ("${CONFIG}" STREQUAL "")
+endif(CMAKE_CONFIGURATION_TYPES)
- add_custom_target(check
- COMMAND ${CMAKE_COMMAND} -E echo
"\"**********************************************************************\""
- COMMAND ${CMAKE_COMMAND} -E echo "NOTE: The \\\"check\\\" a.k.a.
\\\"BRL-CAD Validation Testing\\\" target runs"
- COMMAND ${CMAKE_COMMAND} -E echo " BRL-CAD\\'s unit, system,
integration, benchmark \\(performance\\), and"
- COMMAND ${CMAKE_COMMAND} -E echo " regression tests. To consider a
build viable for production use,"
- COMMAND ${CMAKE_COMMAND} -E echo " these tests must pass.
Dependencies are compiled automatically."
- COMMAND ${CMAKE_COMMAND} -E echo
"\"**********************************************************************\""
+add_custom_target(check
+ COMMAND ${CMAKE_COMMAND} -E echo
"\"**********************************************************************\""
+ COMMAND ${CMAKE_COMMAND} -E echo "NOTE: The \\\"check\\\" a.k.a.
\\\"BRL-CAD Validation Testing\\\" target runs"
+ COMMAND ${CMAKE_COMMAND} -E echo " BRL-CAD\\'s unit, system,
integration, benchmark \\(performance\\), and"
+ COMMAND ${CMAKE_COMMAND} -E echo " regression tests. To consider
a build viable for production use,"
+ COMMAND ${CMAKE_COMMAND} -E echo " these tests must pass.
Dependencies are compiled automatically."
+ COMMAND ${CMAKE_COMMAND} -E echo
"\"**********************************************************************\""
COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -LE
\"Regression|STAND_ALONE\" -E \"^regress-|NOTE|benchmark|slow-\"
--output-on-failure ${JFLAG}
- COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -R \"benchmark\"
--output-on-failure ${JFLAG}
- COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -L \"Regression\"
--output-on-failure ${JFLAG}
- )
- set_target_properties(check PROPERTIES FOLDER "BRL-CAD Validation Testing")
+ COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -R \"benchmark\"
--output-on-failure ${JFLAG}
+ COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -L \"Regression\"
--output-on-failure ${JFLAG}
+ )
+set_target_properties(check PROPERTIES FOLDER "BRL-CAD Validation Testing")
# To support "make unit" (which will build the required targets for testing
# in the style of GNU Autotools "make check") we define a "unit" target per
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
