Revision: 75911
http://sourceforge.net/p/brlcad/code/75911
Author: starseeker
Date: 2020-05-24 15:45:06 +0000 (Sun, 24 May 2020)
Log Message:
-----------
Reenable nurbs ray tests
Modified Paths:
--------------
brlcad/branches/bioh/regress/CMakeLists.txt
brlcad/branches/bioh/regress/nurbs/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/bioh/regress/nurbs/regress-nurbs-test.cmake.in
Removed Paths:
-------------
brlcad/branches/bioh/regress/nurbs/regress-nurbs-nirt.cmake.in
Modified: brlcad/branches/bioh/regress/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/CMakeLists.txt 2020-05-24 15:02:08 UTC (rev
75910)
+++ brlcad/branches/bioh/regress/CMakeLists.txt 2020-05-24 15:45:06 UTC (rev
75911)
@@ -21,7 +21,7 @@
add_subdirectory(gcv)
# NURBS Regression Tests
-#add_subdirectory(nurbs)
+add_subdirectory(nurbs)
# libpkg Regression Tests
#add_subdirectory(pkg)
Modified: brlcad/branches/bioh/regress/nurbs/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/nurbs/CMakeLists.txt 2020-05-24 15:02:08 UTC
(rev 75910)
+++ brlcad/branches/bioh/regress/nurbs/CMakeLists.txt 2020-05-24 15:45:06 UTC
(rev 75911)
@@ -1,63 +1,39 @@
-if(CMAKE_CONFIGURATION_TYPES)
- set(cfg_testname "-${CMAKE_CFG_INTDIR}")
-else(CMAKE_CONFIGURATION_TYPES)
- set(cfg_testname "")
-endif(CMAKE_CONFIGURATION_TYPES)
+# All NURBS ray tests will use the same template script
+set(TSCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/regress-nurbs-test.cmake.in")
-macro(ADD_NURBS_NIRT_Test testname topts gfile targs depends_list)
- set(LOG_FILE
"${CMAKE_CURRENT_BINARY_DIR}/regress${cfg_testname}-${testname}.log")
- set(STAMP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${testname}${cfg_testname}.done")
- set(NHIT_NAME "${testname}")
- set(NHIT_OPTS "${topts}")
- set(NHIT_GFILE "${gfile}")
- set(NHIT_ARGS "${targs}")
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/regress-nurbs-nirt.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/regress-nurbs-nirt-${testname}.cmake" @ONLY)
- add_custom_command(
- OUTPUT "${STAMP_FILE}"
- COMMAND "${CMAKE_COMMAND}" -P
"${CMAKE_CURRENT_BINARY_DIR}/regress-nurbs-nirt-${testname}.cmake"
- DEPENDS ${depends_list}
- )
- add_test(NAME regress-nurbs-nirt-${testname} COMMAND "${CMAKE_COMMAND}" -P
"${CMAKE_CURRENT_BINARY_DIR}/regress-nurbs-nirt-${testname}.cmake")
- add_custom_target(regress-nurbs-nirt-${testname} DEPENDS ${depends_list}
${STAMP_FILE})
- Add_Regression_Test(nurbs-nirt-${testname} "${depends_list}")
- set_target_properties(regress-nurbs-nirt-${testname} PROPERTIES FOLDER
"BRL-CAD Regression Tests/NURBS")
+set(NHIT_NAME "NIST03_MISS_01")
+set(NHIT_OPTS "-M -b")
+set(NHIT_GFILE "${DATA_DIR}/db/nist/NIST_MBE_PMI_3.g")
+set(NHIT_ARGS "Document -114.61944548140064626 -127.49462006675899772
-134.83948901109894791 35 25")
+BRLCAD_REGRESSION_TEST(regress-nurbs_${NHIT_NAME}
"analyze_nhit;NIST_MBE_PMI_3.g" TEST_SCRIPT "${TSCRIPT}" EXEC analyze_nhit)
+set_target_properties(regress-nurbs_${NHIT_NAME} PROPERTIES FOLDER "BRL-CAD
Regression Tests/NURBS")
+DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/${regress-nurbs_${NHIT_NAME}}.log)
- add_dependencies(regress-nurbs regress-nurbs-nirt-${testname})
- DISTCLEAN(
- ${STAMP_FILE}
- ${LOG_FILE}
- ${TARGET_IMAGE}
- )
-endmacro()
+set(NHIT_NAME "PLATE_MODE_CYL_HIT_01")
+set(NHIT_OPTS "-b")
+set(NHIT_GFILE "${CMAKE_SOURCE_DIR}/src/libbrep/tests/plate_mode_samples.g")
+set(NHIT_ARGS "sph.brep 0 0 0 0 0")
+#BRLCAD_REGRESSION_TEST(regress-nurbs_${NHIT_NAME} "analyze_nhit" TEST_SCRIPT
"${TSCRIPT}" EXEC analyze_nhit)
+#set_target_properties(regress-nurbs-${NHIT_NAME} PROPERTIES FOLDER "BRL-CAD
Regression Tests/NURBS")
+#DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/${regress-nurbs_${NHIT_NAME}.log)
-add_custom_target(regress-nurbs)
-#set_target_properties(regress-nurbs PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
-set_target_properties(regress-nurbs PROPERTIES FOLDER "BRL-CAD Regression
Tests")
-ADD_NURBS_NIRT_Test(NIST03_MISS_01
- "-M -b"
- "${DATA_DIR}/db/nist/NIST_MBE_PMI_3.g"
- "Document -114.61944548140064626 -127.49462006675899772
-134.83948901109894791 35 25"
- "analyze_nhit;NIST_MBE_PMI_3.g")
+set(NHIT_NAME "SPH_SOLID_HIT_LEN_01")
+set(NHIT_OPTS "-L 2000 -b")
+set(NHIT_GFILE "${CMAKE_CURRENT_SOURCE_DIR}/sph.g")
+set(NHIT_ARGS "sph.brep 0 0 0 0 0")
+BRLCAD_REGRESSION_TEST(regress-nurbs_${NHIT_NAME} "analyze_nhit" TEST_SCRIPT
"${TSCRIPT}" EXEC analyze_nhit)
+DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/${regress-nurbs_${NHIT_NAME}}.log)
-#ADD_NURBS_NIRT_Test(PLATE_MODE_CYL_HIT_01
-# "-b"
-# "${CMAKE_SOURCE_DIR}/src/libbrep/tests/plate_mode_samples.g"
-# "cylinder.s 51.20451138795556290 -9.99999987347469776 19.42666674721774100
0 0"
-# "analyze_nhit")
-ADD_NURBS_NIRT_Test(SPH_SOLID_HIT_LEN_01
- "-L 2000 -b"
- "${CMAKE_CURRENT_SOURCE_DIR}/sph.g"
- "sph.brep 0 0 0 0 0"
- "analyze_nhit")
+set(NHIT_NAME "BOX_PLATE_HIT_LEN_01")
+set(NHIT_OPTS "-L .1 -b")
+set(NHIT_GFILE "${CMAKE_SOURCE_DIR}/src/libbrep/tests/plate_mode_samples.g")
+set(NHIT_ARGS "box.s 0 0 0 270 90")
+BRLCAD_REGRESSION_TEST(regress-nurbs_${NHIT_NAME} "analyze_nhit" TEST_SCRIPT
"${TSCRIPT}" EXEC analyze_nhit)
+DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/${regress-nurbs_${NHIT_NAME}}.log)
-ADD_NURBS_NIRT_Test(BOX_PLATE_HIT_LEN_01
- "-L .1 -b"
- "${CMAKE_SOURCE_DIR}/src/libbrep/tests/plate_mode_samples.g"
- "box.s 0 0 0 270 90"
- "analyze_nhit")
CMAKEFILES(
brep-3dm.tar.bz2
Deleted: brlcad/branches/bioh/regress/nurbs/regress-nurbs-nirt.cmake.in
===================================================================
--- brlcad/branches/bioh/regress/nurbs/regress-nurbs-nirt.cmake.in
2020-05-24 15:02:08 UTC (rev 75910)
+++ brlcad/branches/bioh/regress/nurbs/regress-nurbs-nirt.cmake.in
2020-05-24 15:45:06 UTC (rev 75911)
@@ -1,52 +0,0 @@
-set(CBDIR "@CMAKE_CURRENT_BINARY_DIR@")
-set(CSDIR "@CMAKE_CURRENT_SOURCE_DIR@")
-set(DDIR "@DATA_DIR@")
-
-# TODO - need to investigate if generator expressions might be used
-# to fully replace this mechanism:
-# https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html
-set(SBDIR "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@")
-set(DBDIR "@CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG@")
-set(RBDIR "@CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE@")
-# Use the mechanism created to allow multiconfig builds to
-# know what the current build type is.
-if(EXISTS "@CMAKE_BINARY_DIR@/CMakeTmp/CURRENT_PATH/Release")
- set(BDIR "${RBDIR}")
- set(test_suffix "-Release")
-elseif(EXISTS "@CMAKE_BINARY_DIR@/CMakeTmp/CURRENT_PATH/Debug")
- set(BDIR "${DBDIR}")
- set(test_suffix "-Debug")
-else(EXISTS "@CMAKE_BINARY_DIR@/CMakeTmp/CURRENT_PATH/Release")
- set(BDIR "${SBDIR}")
- set(test_suffix)
-endif(EXISTS "@CMAKE_BINARY_DIR@/CMakeTmp/CURRENT_PATH/Release")
-
-get_filename_component(EXE "@CMAKE_COMMAND@" EXT)
-set(NHIT "${BDIR}/analyze_nhit${EXE}")
-
-get_filename_component(GFILE_FP "@NHIT_GFILE@" ABSOLUTE)
-if ("${GFILE_FP}" STREQUAL "@NHIT_GFILE@")
- set(NHIT_G "@NHIT_GFILE@")
-else ("${GFILE_FP}" STREQUAL "@NHIT_GFILE@")
- set(NHIT_G "${BDIR}/../@NHIT_GFILE@")
-endif ("${GFILE_FP}" STREQUAL "@NHIT_GFILE@")
-
-execute_process(
- COMMAND "${NHIT}" @NHIT_OPTS@ "${NHIT_G}" @NHIT_ARGS@ RESULT_VARIABLE
nurbs_nirt_result
- OUTPUT_VARIABLE nurbs_nirt_log ERROR_VARIABLE nurbs_nirt_log
- WORKING_DIRECTORY ${CBDIR}
- )
-
-if(nurbs_nirt_result)
- message(FATAL_ERROR "[nurbs_nirt] Failure, unexpected result running ${NHIT}
@NHIT_OPTS@ @NHIT_GFILE@ @NHIT_ARGS@\n ${nurbs_nirt_log}\n")
-else(nurbs_nirt_result)
- execute_process(COMMAND "@CMAKE_COMMAND@" -E touch
"@CMAKE_CURRENT_BINARY_DIR@/@NHIT_NAME@${test_suffix}.done")
-endif(nurbs_nirt_result)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-
Copied: brlcad/branches/bioh/regress/nurbs/regress-nurbs-test.cmake.in (from
rev 75910, brlcad/branches/bioh/regress/nurbs/regress-nurbs-nirt.cmake.in)
===================================================================
--- brlcad/branches/bioh/regress/nurbs/regress-nurbs-test.cmake.in
(rev 0)
+++ brlcad/branches/bioh/regress/nurbs/regress-nurbs-test.cmake.in
2020-05-24 15:45:06 UTC (rev 75911)
@@ -0,0 +1,49 @@
+# Values set at CMake configure time
+set(CBDIR "@CMAKE_CURRENT_BINARY_DIR@")
+set(CSDIR "@CMAKE_CURRENT_SOURCE_DIR@")
+set(LOGFILE "${CBDIR}/regress-nurbs_${NHIT_NAME}.log")
+
+file(WRITE "${LOGFILE}" "Starting nurbs test run\n")
+
+# The executable locations aren't know at CMake configure time, so one of them
+# is passed in via the EXEC variable at runtime. De-quote it and assign it to
+# the appropriate variable.
+string(REPLACE "\\" "" NHIT "${EXEC}")
+if (NOT EXISTS "${NHIT}")
+ file(WRITE "${LOGFILE}" "analyze_nhit not found at location \"${NHIT}\" -
aborting\n")
+ message(FATAL_ERROR "Unable to find analyze_nhit, aborting.\nSee ${LOGFILE}
for more details.")
+endif (NOT EXISTS "${NHIT}")
+
+# Canonicalize path - if we have an absolute path use it, but if the .g file is
+# a build output we need to find the local configuration's version of the .g
+# file. The caller needs to define a relative path to the root of the build.
+get_filename_component(BDIR "${NHIT}" DIRECTORY)
+get_filename_component(GFILE_FP "@NHIT_GFILE@" ABSOLUTE)
+if ("${GFILE_FP}" STREQUAL "@NHIT_GFILE@")
+ set(NHIT_G "@NHIT_GFILE@")
+else ("${GFILE_FP}" STREQUAL "@NHIT_GFILE@")
+ # TODO - need a better answer - if BIN_DIR isn't a single directory this
+ # won't work. Really should come in via a generator expression, but
+ # that needs to be another argument to the cmake command...
+ set(NHIT_G "${BDIR}/../@NHIT_GFILE@")
+endif ("${GFILE_FP}" STREQUAL "@NHIT_GFILE@")
+
+execute_process(
+ COMMAND "${NHIT}" @NHIT_OPTS@ "${NHIT_G}" @NHIT_ARGS@
+ RESULT_VARIABLE nurbs_result OUTPUT_VARIABLE nurbs_log ERROR_VARIABLE
nurbs_log
+ WORKING_DIRECTORY ${CBDIR}
+ )
+
+if(nurbs_result)
+ message(FATAL_ERROR "[nurbs] Failure, unexpected result running ${NHIT}
@NHIT_OPTS@ @NHIT_GFILE@ @NHIT_ARGS@\n ${nurbs_log}\n")
+else(nurbs_result)
+ execute_process(COMMAND "@CMAKE_COMMAND@" -E touch
"@CMAKE_CURRENT_BINARY_DIR@/@NHIT_NAME@${test_suffix}.done")
+endif(nurbs_result)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
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
