Revision: 77720
http://sourceforge.net/p/brlcad/code/77720
Author: starseeker
Date: 2020-11-10 20:18:29 +0000 (Tue, 10 Nov 2020)
Log Message:
-----------
Go with a BRLCAD_ADD_TEST wrapper in lieu of using the _add_test approach.
Simpler (no need for whitespace workaround) and conforms to CMake recommended
practice.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/bench/CMakeLists.txt
brlcad/trunk/regress/CMakeLists.txt
brlcad/trunk/regress/asc/CMakeLists.txt
brlcad/trunk/regress/bots/CMakeLists.txt
brlcad/trunk/regress/comgeom/CMakeLists.txt
brlcad/trunk/regress/dsp/CMakeLists.txt
brlcad/trunk/regress/fuzz/CMakeLists.txt
brlcad/trunk/regress/gqa/CMakeLists.txt
brlcad/trunk/regress/iges/CMakeLists.txt
brlcad/trunk/regress/lights/CMakeLists.txt
brlcad/trunk/regress/mged/CMakeLists.txt
brlcad/trunk/regress/moss/CMakeLists.txt
brlcad/trunk/regress/nirt/CMakeLists.txt
brlcad/trunk/regress/red/CMakeLists.txt
brlcad/trunk/regress/rtedge/CMakeLists.txt
brlcad/trunk/regress/shaders/CMakeLists.txt
brlcad/trunk/regress/solids/CMakeLists.txt
brlcad/trunk/regress/spdi/CMakeLists.txt
brlcad/trunk/regress/weight/CMakeLists.txt
brlcad/trunk/src/gtools/tests/CMakeLists.txt
brlcad/trunk/src/libanalyze/tests/CMakeLists.txt
brlcad/trunk/src/libbg/tests/CMakeLists.txt
brlcad/trunk/src/libbn/tests/CMakeLists.txt
brlcad/trunk/src/libbrep/tests/CMakeLists.txt
brlcad/trunk/src/libbu/tests/CMakeLists.txt
brlcad/trunk/src/libbu/tests/dylib/CMakeLists.txt
brlcad/trunk/src/libgcv/tests/CMakeLists.txt
brlcad/trunk/src/libged/simulate/tests/CMakeLists.txt
brlcad/trunk/src/libged/tests/CMakeLists.txt
brlcad/trunk/src/libnmg/tests/CMakeLists.txt
brlcad/trunk/src/librt/tests/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev 77719)
+++ brlcad/trunk/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev 77720)
@@ -303,29 +303,35 @@
#---------------------------------------------------------------------
# "make check" runs all of the tests (unit, benchmark, and regression) that
are expected to work.
-if(NOT BRLCAD_IS_SUBBUILD)
- 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
+# "make unit" runs all the unit tests.
+# To build the required targets for testing in the style of GNU Autotools "make
+# check") we define "unit" and "check" targets per
+# http://www.cmake.org/Wiki/CMakeEmulateMakeCheck and have add_test
+# automatically assemble its targets into the unit dependency list.
+
+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(NOT N EQUAL 0)
+ 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)
+if (NOT TARGET check)
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"
@@ -338,36 +344,9 @@
COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -L \"Regression\"
--output-on-failure ${JFLAG}
)
set_target_properties(check PROPERTIES FOLDER "BRL-CAD Validation Testing")
-endif(NOT BRLCAD_IS_SUBBUILD)
+endif (NOT TARGET check)
-
-# 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
-# http://www.cmake.org/Wiki/CMakeEmulateMakeCheck and have add_test
-# automatically assemble its targets into the unit dependency list.
-if(NOT BRLCAD_IS_SUBBUILD)
- 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(CMAKE_CONFIGURATION_TYPES)
- set(CONFIG $<CONFIG>)
- else(CMAKE_CONFIGURATION_TYPES)
- if ("${CONFIG}" STREQUAL "")
- set(CONFIG "\"\"")
- endif ("${CONFIG}" STREQUAL "")
- endif(CMAKE_CONFIGURATION_TYPES)
-
+if (NOT TARGET unit)
add_custom_target(unit
COMMAND ${CMAKE_COMMAND} -E echo
"\"**********************************************************************\""
COMMAND ${CMAKE_COMMAND} -E echo "NOTE: The \\\"unit\\\" a.k.a.
\\\"BRL-CAD Unit Testing\\\" target runs the"
@@ -377,129 +356,44 @@
COMMAND ${CMAKE_COMMAND} -E echo
"\"**********************************************************************\""
COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -LE \"Regression|NOT_WORKING\"
-E \"^regress-|NOTE|benchmark|slow-\" ${JFLAG}
)
-
set_target_properties(unit PROPERTIES FOLDER "BRL-CAD Validation Testing")
+endif (NOT TARGET unit)
- # we wrap the CMake add_test() function in order to automatically
- # set up test dependencies for the 'unit' and 'check' test targets.
- #
- # this function extravagantly tries to work around a bug in CMake
- # where we cannot pass an empty string through this wrapper to
- # _add_test()/add_test(). passed as a list (e.g., via ARGN, ARGV,
- # or manually composed), the empty string is skipped(!). passed as
- # a string, it is all treated as command name with no arguments.
- #
- # manual workaround used here involves invoking _add_test() with all
- # args individually recreated/specified (i.e., not as a list) as
- # this preserves empty strings. this approach means we cannot
- # generalize and only support a limited variety of empty string
- # arguments, but we do test and halt if someone unknowingly tries.
- function(add_test NAME test_name COMMAND test_prog)
+# we wrap the CMake add_test() function in order to automatically
+# set up test dependencies for the 'unit' and 'check' test targets.
+function(BRLCAD_ADD_TEST NAME test_name COMMAND test_prog)
- # find any occurrences of empty strings
- set(idx 0)
- set(matches)
- foreach (ARG IN LISTS ARGV)
- # need 'x' to avoid older cmake seeing "COMMAND" "STREQUAL" ""
- if ("x${ARG}" STREQUAL "x")
- list(APPEND matches ${idx})
- endif ("x${ARG}" STREQUAL "x")
- math(EXPR idx "${idx} + 1")
- endforeach()
+ add_test(NAME ${test_name} COMMAND ${test_prog} ${ARGN})
- # make sure we don't exceed current support
- list(LENGTH matches cnt)
- if ("${cnt}" GREATER 1)
- message(FATAL_ERROR "ERROR: encountered ${cnt} > 1 empty string being
passed to add_test(${test_name}). Expand support in the top-level
CMakeLists.txt file (grep add_test) or pass fewer empty strings.")
- endif ("${cnt}" GREATER 1)
+ # There are a variety of criteria that disqualify test_prog as a
+ # dependency - check and return if we hit any of them.
+ if (NOT TARGET ${test_prog})
+ return()
+ endif ()
+ if (NOT "${test_name}" MATCHES ^regress-)
+ return()
+ endif ()
+ if (NOT "${test_prog}" MATCHES ^regress-)
+ return()
+ endif ()
+ if (NOT "${test_name}" MATCHES ^slow-)
+ return()
+ endif ()
+ if (NOT "${test_name}" STREQUAL "benchmark")
+ return()
+ endif ()
+ if (NOT "${test_name}" MATCHES ^NOTE:)
+ return()
+ endif ()
- # if there are empty strings, we need to manually recreate their calling
- if ("${cnt}" GREATER 0)
+ # add program needed for test to unit and check target dependencies
+ add_dependencies(unit ${test_prog})
+ add_dependencies(check ${test_prog})
- list(GET matches 0 empty)
- if ("${empty}" EQUAL 4)
- foreach (i 1)
- if (ARGN)
- list(REMOVE_AT ARGN 0)
- endif (ARGN)
- endforeach ()
- _add_test(NAME ${test_name} COMMAND ${test_prog} "" ${ARGN})
- elseif ("${empty}" EQUAL 5)
- foreach (i 1 2)
- if (ARGN)
- list(REMOVE_AT ARGN 0)
- endif (ARGN)
- endforeach ()
- _add_test(NAME ${test_name} COMMAND ${test_prog} ${ARGV4} "" ${ARGN})
- elseif ("${empty}" EQUAL 6)
- foreach (i 1 2 3)
- if (ARGN)
- list(REMOVE_AT ARGN 0)
- endif (ARGN)
- endforeach ()
- _add_test(NAME ${test_name} COMMAND ${test_prog} ${ARGV4} ${ARGV5} ""
${ARGN})
- elseif ("${empty}" EQUAL 7)
- foreach (i 1 2 3 4)
- if (ARGN)
- list(REMOVE_AT ARGN 0)
- endif (ARGN)
- endforeach ()
- _add_test(NAME ${test_name} COMMAND ${test_prog} ${ARGV4} ${ARGV5}
${ARGV6} "" ${ARGN})
- elseif ("${empty}" EQUAL 8)
- foreach (i 1 2 3 4 5)
- if (ARGN)
- list(REMOVE_AT ARGN 0)
- endif (ARGN)
- endforeach ()
- _add_test(NAME ${test_name} COMMAND ${test_prog} ${ARGV4} ${ARGV5}
${ARGV6} ${ARGV7} "" ${ARGN})
- elseif ("${empty}" EQUAL 9)
- foreach (i 1 2 3 4 5 6)
- if (ARGN)
- list(REMOVE_AT ARGN 0)
- endif (ARGN)
- endforeach ()
- _add_test(NAME ${test_name} COMMAND ${test_prog} ${ARGV4} ${ARGV5}
${ARGV6} ${ARGV7} ${ARGV8} "" ${ARGN})
- elseif ("${empty}" EQUAL 10)
- foreach (i 1 2 3 4 5 6)
- if (ARGN)
- list(REMOVE_AT ARGN 0)
- endif (ARGN)
- endforeach ()
- _add_test(NAME ${test_name} COMMAND ${test_prog} ${ARGV4} ${ARGV5}
${ARGV6} ${ARGV7} ${ARGV8} ${ARGV9} "" ${ARGN})
- elseif ("${empty}" EQUAL 11)
- foreach (i 1 2 3 4 5 6)
- if (ARGN)
- list(REMOVE_AT ARGN 0)
- endif (ARGN)
- endforeach ()
- _add_test(NAME ${test_name} COMMAND ${test_prog} ${ARGV4} ${ARGV5}
${ARGV6} ${ARGV7} ${ARGV8} ${ARGV9} ${ARGV10} "" ${ARGN})
+endfunction(BRLCAD_ADD_TEST NAME test_name COMMAND test_prog)
- # ADD_EMPTY_HERE: insert support for addition argv positions
- # as extra elseif tests here using the preceding pattern. be
- # sure to update the index in the following else clause fatal
- # error message too.
- else ("${empty}" EQUAL 4)
- message(FATAL_ERROR "ERROR: encountered an empty string passed to
add_test(${test_name}) as ARGV${empty} > ARGV9. Expand support in the
top-level CMakeLists.txt file (grep ADD_EMPTY_HERE).")
- endif ("${empty}" EQUAL 4)
-
- else ("${cnt}" GREATER 0)
- # no empty strings, no worries
- _add_test(NAME ${test_name} COMMAND ${test_prog} ${ARGN})
- endif ("${cnt}" GREATER 0)
-
- # add test to unit and check targets
- if (NOT "${test_name}" MATCHES ^regress- AND NOT "${test_prog}" MATCHES
^regress- AND NOT "${test_name}" MATCHES ^slow- AND NOT "${test_name}" STREQUAL
"benchmark" AND NOT "${test_name}" MATCHES ^NOTE:)
- add_dependencies(unit ${test_prog})
- add_dependencies(check ${test_prog})
- endif (NOT "${test_name}" MATCHES ^regress- AND NOT "${test_prog}" MATCHES
^regress- AND NOT "${test_name}" MATCHES ^slow- AND NOT "${test_name}" STREQUAL
"benchmark" AND NOT "${test_name}" MATCHES ^NOTE:)
-
- endfunction(add_test NAME test_name COMMAND test_prog)
-endif(NOT BRLCAD_IS_SUBBUILD)
-
-
-
#---------------------------------------------------------------------
# Load macros that will be used to define the BRL-CAD
# build logic
Modified: brlcad/trunk/bench/CMakeLists.txt
===================================================================
--- brlcad/trunk/bench/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev 77719)
+++ brlcad/trunk/bench/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev 77720)
@@ -48,7 +48,7 @@
if(SH_EXEC AND TARGET m35.g)
# CTest enabled short run of the benchmark suite
- add_test(NAME benchmark COMMAND ${SH_EXEC}
"$<TARGET_FILE_DIR:bark>/benchmark" run TIMEFRAME=1)
+ BRLCAD_ADD_TEST(NAME benchmark COMMAND ${SH_EXEC}
"$<TARGET_FILE_DIR:bark>/benchmark" run TIMEFRAME=1)
set_tests_properties(benchmark PROPERTIES LABELS "Benchmark")
add_custom_target(benchmark-check
COMMAND ${CMAKE_CTEST_COMMAND} -L Benchmark --output-on-failure
Modified: brlcad/trunk/regress/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev 77719)
+++ brlcad/trunk/regress/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev 77720)
@@ -108,11 +108,11 @@
if(SH_EXEC)
- add_test(NAME regress-usage COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/usage.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-usage COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/usage.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-usage "rt" STAND_ALONE TEST_DEFINED)
# TODO - test for Python before adding this one
- add_test(NAME regress-flawfinder COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/flawfinder.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-flawfinder COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/flawfinder.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-flawfinder "" STAND_ALONE TEST_DEFINED)
endif(SH_EXEC)
Modified: brlcad/trunk/regress/asc/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/asc/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/asc/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -2,12 +2,12 @@
if (TARGET asc2g)
- add_test(NAME regress-asc COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/asc.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-asc COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/asc.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-asc "asc2g;g2asc;gdiff;dbupgrade"
TEST_DEFINED)
endif (TARGET asc2g)
- add_test(NAME regress-asc2dsp COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/asc2dsp.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-asc2dsp COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/asc2dsp.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-asc2dsp "cv;asc2pix;pix-bw;asc2dsp"
TEST_DEFINED)
endif(SH_EXEC)
Modified: brlcad/trunk/regress/bots/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/bots/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/bots/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -1,7 +1,7 @@
if (SH_EXEC AND TARGET mged)
- add_test(NAME regress-bots COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/bots.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-bots COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/bots.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-bots "mged;pixdiff;rt" TEST_DEFINED)
endif (SH_EXEC AND TARGET mged)
Modified: brlcad/trunk/regress/comgeom/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/comgeom/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/comgeom/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -1,7 +1,7 @@
if (SH_EXEC AND TARGET mged AND TARGET asc2g)
- add_test(NAME regress-comgeom COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/comgeom.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-comgeom COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/comgeom.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-comgeom "mged;asc2g;vdeck;comgeom-g"
TEST_DEFINED)
endif (SH_EXEC AND TARGET mged AND TARGET asc2g)
Modified: brlcad/trunk/regress/dsp/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/dsp/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/dsp/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -2,7 +2,7 @@
if (SH_EXEC AND TARGET mged)
if (NOT WIN32)
- add_test(NAME regress-dsp COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/dsp.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-dsp COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/dsp.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-dsp "mged;cv;asc2pix;rt;pix-bw"
TEST_DEFINED)
else (NOT WIN32)
message(WARNING "regress-dsp failes on some Windows platforms (pix-bw
appears to hang on github runners) - skipping")
Modified: brlcad/trunk/regress/fuzz/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/fuzz/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/fuzz/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -19,7 +19,7 @@
install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/fuzz" DESTINATION ${BIN_DIR})
configure_file(run.sh ${CMAKE_BINARY_DIR}/bin/fuzz COPYONLY)
- #add_test(NAME fuzz COMMAND ${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/fuzz run)
+ #BRLCAD_ADD_TEST(NAME fuzz COMMAND ${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/fuzz
run)
add_custom_target(fuzz
COMMAND ${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/fuzz run
Modified: brlcad/trunk/regress/gqa/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/gqa/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/gqa/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -1,7 +1,7 @@
if (SH_EXEC AND TARGET mged AND TARGET gqa)
- add_test(NAME regress-gqa COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/gqa.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-gqa COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/gqa.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-gqa "gqa;mged" TEST_DEFINED)
endif (SH_EXEC AND TARGET mged AND TARGET gqa)
Modified: brlcad/trunk/regress/iges/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/iges/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/iges/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -2,7 +2,7 @@
if (SH_EXEC AND TARGET mged AND TARGET asc2g)
if (NOT WIN32)
- add_test(NAME regress-iges COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/iges.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-iges COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/iges.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-iges "iges-g;g-iges;mged;asc2g"
TEST_DEFINED)
else (NOT WIN32)
message(WARNING "iges.sh doesn not currently pass on Windows - disabling")
Modified: brlcad/trunk/regress/lights/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/lights/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/lights/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -1,7 +1,7 @@
if (SH_EXEC AND TARGET asc2g)
- add_test(NAME regress-lights COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/lights.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-lights COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/lights.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-lights "rt;asc2g;pixdiff" TEST_DEFINED)
endif (SH_EXEC AND TARGET asc2g)
Modified: brlcad/trunk/regress/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/mged/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/mged/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -98,7 +98,7 @@
# Original shell based test
if (SH_EXEC)
- add_test(NAME regress-mged COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/mged.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-mged COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/mged.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-mged "mged;rtarea;rt;rtcheck" TEST_DEFINED)
endif (SH_EXEC)
Modified: brlcad/trunk/regress/moss/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/moss/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/moss/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -1,7 +1,7 @@
if (SH_EXEC AND TARGET mged AND TARGET asc2g)
- add_test(NAME regress-moss COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/moss.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-moss COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/moss.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-moss "rt;asc2g;pixdiff;pix-png;png-pix"
TEST_DEFINED)
endif (SH_EXEC AND TARGET mged AND TARGET asc2g)
Modified: brlcad/trunk/regress/nirt/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/nirt/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/nirt/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -1,7 +1,7 @@
if (SH_EXEC AND TARGET mged)
- add_test(NAME regress-nirt COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/nirt.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-nirt COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/nirt.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-nirt "mged;nirt" TEST_DEFINED)
endif (SH_EXEC AND TARGET mged)
Modified: brlcad/trunk/regress/red/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/red/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/red/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -2,7 +2,7 @@
if (SH_EXEC AND TARGET mged)
if (NOT WIN32)
- add_test(NAME regress-red COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/red.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-red COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/red.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-red mged TEST_DEFINED)
else (NOT WIN32)
message(WARNING "regress-red does not currently pass on Windows,
disabling")
Modified: brlcad/trunk/regress/rtedge/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/rtedge/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/rtedge/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -1,7 +1,7 @@
if (SH_EXEC AND TARGET mged AND TARGET asc2g)
- add_test(NAME regress-rtedge COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/rtedge.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-rtedge COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/rtedge.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-rtedge "rt;rtedge;pixdiff;asc2g" TEST_DEFINED)
endif (SH_EXEC AND TARGET mged AND TARGET asc2g)
Modified: brlcad/trunk/regress/shaders/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/shaders/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/shaders/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -1,7 +1,7 @@
if (SH_EXEC AND TARGET mged AND TARGET gencolor)
- add_test(NAME regress-shaders COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/shaders.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-shaders COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/shaders.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-shaders "rt;mged;pixdiff;gencolor"
TEST_DEFINED)
endif (SH_EXEC AND TARGET mged AND TARGET gencolor)
Modified: brlcad/trunk/regress/solids/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/solids/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/solids/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -1,7 +1,7 @@
if (SH_EXEC AND TARGET mged AND TARGET asc2g)
- add_test(NAME regress-solids COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/solids.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-solids COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/solids.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-solids
"rt;asc2g;asc2pix;pixdiff;pix-png;png-pix" TEST_DEFINED)
endif (SH_EXEC AND TARGET mged AND TARGET asc2g)
Modified: brlcad/trunk/regress/spdi/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/spdi/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/spdi/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -1,7 +1,7 @@
if (SH_EXEC AND TARGET mged)
- add_test(NAME regress-spdi COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/spdi.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-spdi COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/spdi.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-spdi "rt;mged;pixdiff" TEST_DEFINED)
endif (SH_EXEC AND TARGET mged)
Modified: brlcad/trunk/regress/weight/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/weight/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/regress/weight/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -1,7 +1,7 @@
if (SH_EXEC AND TARGET mged)
- add_test(NAME regress-weight COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/weight.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_ADD_TEST(NAME regress-weight COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/weight.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-weight "rtweight;mged" TEST_DEFINED)
endif (SH_EXEC AND TARGET mged)
Modified: brlcad/trunk/src/gtools/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/gtools/tests/CMakeLists.txt 2020-11-10 19:29:05 UTC
(rev 77719)
+++ brlcad/trunk/src/gtools/tests/CMakeLists.txt 2020-11-10 20:18:29 UTC
(rev 77720)
@@ -1,8 +1,8 @@
BRLCAD_ADDEXEC(bigdb bigdb.c "libged;libwdb;librt;libbu" TEST_USESDATA)
-add_test(NAME slow-bigdb_1gb COMMAND bigdb 1)
-add_test(NAME slow-bigdb_5gb COMMAND bigdb 5)
+BRLCAD_ADD_TEST(NAME slow-bigdb_1gb COMMAND bigdb 1)
+BRLCAD_ADD_TEST(NAME slow-bigdb_5gb COMMAND bigdb 5)
set_property(TEST slow-bigdb_1gb PROPERTY SKIP_RETURN_CODE 123)
set_property(TEST slow-bigdb_5gb PROPERTY SKIP_RETURN_CODE 123)
Modified: brlcad/trunk/src/libanalyze/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libanalyze/tests/CMakeLists.txt 2020-11-10 19:29:05 UTC
(rev 77719)
+++ brlcad/trunk/src/libanalyze/tests/CMakeLists.txt 2020-11-10 20:18:29 UTC
(rev 77720)
@@ -7,8 +7,8 @@
#####################################
BRLCAD_ADDEXEC(analyze_densities density.cpp "libanalyze;libbu" TEST)
-add_test(NAME analyze_densities_null COMMAND analyze_densities)
-add_test(NAME analyze_densities_std COMMAND analyze_densities std)
+BRLCAD_ADD_TEST(NAME analyze_densities_null COMMAND analyze_densities)
+BRLCAD_ADD_TEST(NAME analyze_densities_std COMMAND analyze_densities
std)
CMAKEFILES(raydiff.g)
Modified: brlcad/trunk/src/libbg/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbg/tests/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/src/libbg/tests/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -37,13 +37,13 @@
BRLCAD_ADDEXEC(bg_obr obr.c "libbg;libbn;libbu" TEST)
-#add_test(NAME bg_obr_simple COMMAND bg_obr) # Default points
+#BRLCAD_ADD_TEST(NAME bg_obr_simple COMMAND bg_obr) #
Default points
# ************ polygon.c tests ***********
BRLCAD_ADDEXEC(bg_polygon_triangulate polygon_triangulate.c
"libbg;libbn;libbu" TEST)
-add_test(NAME bg_polygon_triangulate COMMAND bg_polygon_triangulate)
+BRLCAD_ADD_TEST(NAME bg_polygon_triangulate COMMAND
bg_polygon_triangulate)
# ************ chull.c tests ***********
@@ -61,17 +61,17 @@
BRLCAD_ADDEXEC(bg_lseg_lseg_dist lseg_lseg.c "libbg;libbn;libbu" TEST)
-add_test(NAME bg_lseg_lseg_1 COMMAND bg_lseg_lseg_dist 1)
+BRLCAD_ADD_TEST(NAME bg_lseg_lseg_1 COMMAND bg_lseg_lseg_dist 1)
# ************ lseg_lseg.c tests ***********
BRLCAD_ADDEXEC(bg_lseg_pt_dist lseg_pt.c "libbg;libbn;libbu" TEST)
-add_test(NAME bg_lseg_pt_dist_case0 COMMAND bg_lseg_pt_dist -5,-5,-5 5,5,5
0,0,0 0,0,0 0)
-add_test(NAME bg_lseg_pt_dist_case1 COMMAND bg_lseg_pt_dist -5,-5,-5 5,5,5
-5,-5,-5 -5,-5,-5, 0)
-add_test(NAME bg_lseg_pt_dist_case2 COMMAND bg_lseg_pt_dist -5,-5,-5 5,5,5
5,5,5 5,5,5, 0)
-add_test(NAME bg_lseg_pt_dist_case3 COMMAND bg_lseg_pt_dist -5,-5,-5 5,5,5
-10,-5,-10 -5,-5,-5 7.07107 )
-add_test(NAME bg_lseg_pt_dist_case4 COMMAND bg_lseg_pt_dist -5,-5,-5 5,5,5
5,10,10 5,5,5 7.07107)
-add_test(NAME bg_lseg_pt_dist_case5 COMMAND bg_lseg_pt_dist -5,-5,-5 5,5,5
0,-5,-5 -3.33333,-3.33333,-3.33333 4.08248)
+BRLCAD_ADD_TEST(NAME bg_lseg_pt_dist_case0 COMMAND bg_lseg_pt_dist -5,-5,-5
5,5,5 0,0,0 0,0,0 0)
+BRLCAD_ADD_TEST(NAME bg_lseg_pt_dist_case1 COMMAND bg_lseg_pt_dist -5,-5,-5
5,5,5 -5,-5,-5 -5,-5,-5, 0)
+BRLCAD_ADD_TEST(NAME bg_lseg_pt_dist_case2 COMMAND bg_lseg_pt_dist -5,-5,-5
5,5,5 5,5,5 5,5,5, 0)
+BRLCAD_ADD_TEST(NAME bg_lseg_pt_dist_case3 COMMAND bg_lseg_pt_dist -5,-5,-5
5,5,5 -10,-5,-10 -5,-5,-5 7.07107 )
+BRLCAD_ADD_TEST(NAME bg_lseg_pt_dist_case4 COMMAND bg_lseg_pt_dist -5,-5,-5
5,5,5 5,10,10 5,5,5 7.07107)
+BRLCAD_ADD_TEST(NAME bg_lseg_pt_dist_case5 COMMAND bg_lseg_pt_dist -5,-5,-5
5,5,5 0,-5,-5 -3.33333,-3.33333,-3.33333 4.08248)
# ************ tri_ray.c tests ***********
@@ -94,17 +94,17 @@
# TODO - need some tests with floating point vertices that are down around the
EPSILON threshold - that's
# where the NEAR_ZERO components of the bg_tri_tri_isect_coplanar logic become
important.
-add_test(NAME bg_tri_tri_isect_coplanar_null_noarea COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1.00001,0,0 2,0,0 1.00001,1,0 0
0)
-add_test(NAME bg_tri_tri_isect_coplanar_vertex_noarea COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1.00001,0,0 2,0,0 1,1,0 0
1)
-add_test(NAME bg_tri_tri_isect_coplanar_edge_noarea COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1,0,0 2,0,0 1,1,0 0
1)
-add_test(NAME bg_tri_tri_isect_coplanar_full_noarea COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1,0,0 2,0,0 0.7,0.8,0 0
1)
-add_test(NAME bg_tri_tri_isect_coplanar_null_area COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1.00001,0,0 2,0,0 1.00001,1,0 1
0)
-add_test(NAME bg_tri_tri_isect_coplanar_vertex_area COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1.00001,0,0 2,0,0 1,1,0 1
0)
-add_test(NAME bg_tri_tri_isect_coplanar_edge_area COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1,0,0 2,0,0 1,1,0 1
0)
-add_test(NAME bg_tri_tri_isect_coplanar_full_area COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1,0,0 2,0,0 0.7,0.8,0 1
1)
+BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_coplanar_null_noarea COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1.00001,0,0 2,0,0 1.00001,1,0 0
0)
+BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_coplanar_vertex_noarea COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1.00001,0,0 2,0,0 1,1,0 0
1)
+BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_coplanar_edge_noarea COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1,0,0 2,0,0 1,1,0 0
1)
+BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_coplanar_full_noarea COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1,0,0 2,0,0 0.7,0.8,0 0
1)
+BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_coplanar_null_area COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1.00001,0,0 2,0,0 1.00001,1,0 1
0)
+BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_coplanar_vertex_area COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1.00001,0,0 2,0,0 1,1,0 1
0)
+BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_coplanar_edge_area COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1,0,0 2,0,0 1,1,0 1
0)
+BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_coplanar_full_area COMMAND
bg_tri_tri_isect_coplanar 0,0,0 1,0,0 1,1,0 1,0,0 2,0,0 0.7,0.8,0 1
1)
# TODO - in the debugger this is looking like it shouldn't return intersecting
- it's very nearly an edge only intersect - but the final point-in-triangle
test is doing something I don't quite understand: it seems to be checking only
one point per triangle for inside/outside instead of all three points against
each triangle...
-#add_test(NAME bg_tri_tri_isect_coplanar_f1 COMMAND bg_tri_tri_isect_coplanar
-0.17062162871133435,0.02417062256398481,0.00000000000000000
-0.20768111931464361,-0.34362144340377737,0.00000000000000000
0.17876567813733310,-0.05826268893839849,0.00000000000000000
0.17876567813748631,-0.05826268893840295,0.00000000000000000
-0.17062162871171396,0.02417062256397554,0.00000000000000000
0.19139302046287024,0.41180557615261132,0.00000000000000000 1 0)
+#BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_coplanar_f1 COMMAND
bg_tri_tri_isect_coplanar
-0.17062162871133435,0.02417062256398481,0.00000000000000000
-0.20768111931464361,-0.34362144340377737,0.00000000000000000
0.17876567813733310,-0.05826268893839849,0.00000000000000000
0.17876567813748631,-0.05826268893840295,0.00000000000000000
-0.17062162871171396,0.02417062256397554,0.00000000000000000
0.19139302046287024,0.41180557615261132,0.00000000000000000 1 0)
# For COMMAND bg_tri_tri_isect, the input format is as follows:
#
@@ -116,13 +116,13 @@
BRLCAD_ADDEXEC(bg_tri_tri_isect tri_tri_isect.c "libbg;libbn;libbu" TEST)
# Test coplanar triangles
-add_test(NAME bg_tri_tri_isect_cp_null COMMAND bg_tri_tri_isect 0,0,0 1,0,0
1,1,0 1.00001,0,0 2,0,0 1.00001,1,0 0)
-add_test(NAME bg_tri_tri_isect_cp_vertex COMMAND bg_tri_tri_isect 0,0,0 1,0,0
1,1,0 1.00001,0,0 2,0,0 1,1,0 1)
-add_test(NAME bg_tri_tri_isect_cp_edge COMMAND bg_tri_tri_isect 0,0,0 1,0,0
1,1,0 1,0,0 2,0,0 1,1,0 1)
-add_test(NAME bg_tri_tri_isect_cp_full COMMAND bg_tri_tri_isect 0,0,0 1,0,0
1,1,0 1,0,0 2,0,0 0.7,0.8,0 1)
+BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_cp_null COMMAND bg_tri_tri_isect
0,0,0 1,0,0 1,1,0 1.00001,0,0 2,0,0 1.00001,1,0 0)
+BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_cp_vertex COMMAND bg_tri_tri_isect
0,0,0 1,0,0 1,1,0 1.00001,0,0 2,0,0 1,1,0 1)
+BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_cp_edge COMMAND bg_tri_tri_isect
0,0,0 1,0,0 1,1,0 1,0,0 2,0,0 1,1,0 1)
+BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_cp_full COMMAND bg_tri_tri_isect
0,0,0 1,0,0 1,1,0 1,0,0 2,0,0 0.7,0.8,0 1)
# Test more general triangles
-add_test(NAME bg_tri_tri_isect_null COMMAND bg_tri_tri_isect 0,0,0 1,0,0
1,1,0 1,0,1 1,0,1 1,1,1 0)
+BRLCAD_ADD_TEST(NAME bg_tri_tri_isect_null COMMAND bg_tri_tri_isect 0,0,0
1,0,0 1,1,0 1,0,1 1,0,1 1,1,1 0)
# ************ tri_closest_pt.c tests ***********
@@ -129,8 +129,8 @@
BRLCAD_ADDEXEC(bg_tri_closest_pt tri_closest_pt.c "libbg;libbn;libbu" TEST)
-add_test(NAME bg_tri_pt_dist_coplanar_center COMMAND bg_tri_closest_pt
0,0,0 -1,-1,0 1,-1,0 0,1,0 0)
-add_test(NAME bg_tri_pt_dist_coplanar_vert_closest COMMAND bg_tri_closest_pt
-2,-1,0 -1,-1,0 1,-1,0 0,1,0 1)
+BRLCAD_ADD_TEST(NAME bg_tri_pt_dist_coplanar_center COMMAND
bg_tri_closest_pt 0,0,0 -1,-1,0 1,-1,0 0,1,0 0)
+BRLCAD_ADD_TEST(NAME bg_tri_pt_dist_coplanar_vert_closest COMMAND
bg_tri_closest_pt -2,-1,0 -1,-1,0 1,-1,0 0,1,0 1)
# ************ polygon_op.cpp tests ***********
@@ -137,7 +137,7 @@
BRLCAD_ADDEXEC(bg_polygon_op polygon_op.c "libbg;libbn;libbu" TEST)
-add_test(NAME bg_polygon_op_basic COMMAND bg_polygon_op)
+BRLCAD_ADD_TEST(NAME bg_polygon_op_basic COMMAND bg_polygon_op)
Modified: brlcad/trunk/src/libbn/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbn/tests/CMakeLists.txt 2020-11-10 19:29:05 UTC (rev
77719)
+++ brlcad/trunk/src/libbn/tests/CMakeLists.txt 2020-11-10 20:18:29 UTC (rev
77720)
@@ -58,18 +58,18 @@
#
# Format is:
# COMMAND bn_test list <2 or 3 (the dimension)> X0,Y0[,Z0] X1,Y1[,Z1]
Xn,Yn[,Zn]
-add_test(NAME bn_list_2d_null COMMAND bn_test list 2) # NULL
list of points
-add_test(NAME bn_list_2d_1 COMMAND bn_test list 2 0,0)
-add_test(NAME bn_list_2d_2 COMMAND bn_test list 2 0,0
1.64,1)
-add_test(NAME bn_list_2d_3 COMMAND bn_test list 2 3,7 1,-5)
-add_test(NAME bn_list_2d_4 COMMAND bn_test list 2 3,7
1,-5.321 67,0 0,100)
+BRLCAD_ADD_TEST(NAME bn_list_2d_null COMMAND bn_test list 2) #
NULL list of points
+BRLCAD_ADD_TEST(NAME bn_list_2d_1 COMMAND bn_test list 2
0,0)
+BRLCAD_ADD_TEST(NAME bn_list_2d_2 COMMAND bn_test list 2
0,0 1.64,1)
+BRLCAD_ADD_TEST(NAME bn_list_2d_3 COMMAND bn_test list 2
3,7 1,-5)
+BRLCAD_ADD_TEST(NAME bn_list_2d_4 COMMAND bn_test list 2
3,7 1,-5.321 67,0 0,100)
-add_test(NAME bn_list_3d_null COMMAND bn_test list 3) # NULL
list of points
-add_test(NAME bn_list_3d_1 COMMAND bn_test list 3 0,0,0)
-add_test(NAME bn_list_3d_2 COMMAND bn_test list 3 0,0,3
1.64,1,4)
-add_test(NAME bn_list_3d_3 COMMAND bn_test list 3 3,7,8
1,-5,8)
-add_test(NAME bn_list_3d_4 COMMAND bn_test list 3 3,7,8
1,-5.321,3 67,0,67 0,100,23)
+BRLCAD_ADD_TEST(NAME bn_list_3d_null COMMAND bn_test list 3) #
NULL list of points
+BRLCAD_ADD_TEST(NAME bn_list_3d_1 COMMAND bn_test list 3
0,0,0)
+BRLCAD_ADD_TEST(NAME bn_list_3d_2 COMMAND bn_test list 3
0,0,3 1.64,1,4)
+BRLCAD_ADD_TEST(NAME bn_list_3d_3 COMMAND bn_test list 3
3,7,8 1,-5,8)
+BRLCAD_ADD_TEST(NAME bn_list_3d_4 COMMAND bn_test list 3
3,7,8 1,-5.321,3 67,0,67 0,100,23)
#
@@ -77,14 +77,14 @@
#
#Format is:
# COMMAND bn_test poly < void > void
-add_test(NAME bn_poly_multiply COMMAND bn_test poly_multiply)
-add_test(NAME bn_poly_scale COMMAND bn_test poly_scale)
-add_test(NAME bn_poly_add COMMAND bn_test poly_add)
+BRLCAD_ADD_TEST(NAME bn_poly_multiply COMMAND bn_test
poly_multiply)
+BRLCAD_ADD_TEST(NAME bn_poly_scale COMMAND bn_test poly_scale)
+BRLCAD_ADD_TEST(NAME bn_poly_add COMMAND bn_test poly_add)
# failure encountered, no output to indicate why (disabled in prep for release)
-# add_test(NAME bn_poly_sub COMMAND bn_test poly_sub)
+# BRLCAD_ADD_TEST(NAME bn_poly_sub COMMAND bn_test poly_sub)
-add_test(NAME bn_poly_synthetic_div COMMAND bn_test
poly_synthetic_div)
+BRLCAD_ADD_TEST(NAME bn_poly_synthetic_div COMMAND bn_test
poly_synthetic_div)
#
@@ -101,22 +101,22 @@
# where P0-P2 are the points in question. An individual point is three
# integer or floating point numbers separated by commas.
-add_test(NAME bn_plane_3pts_collinear_false_1 COMMAND bn_test plane_pt
1 0,0,0 1,1,1 6,3,8 0)
-add_test(NAME bn_plane_3pts_collinear_false_2 COMMAND bn_test plane_pt
1 0,0,0 6,3,8 1,1,1 0)
-add_test(NAME bn_plane_3pts_collinear_false_3 COMMAND bn_test plane_pt
1 1,1,1 0,0,0 6,3,8 0)
-add_test(NAME bn_plane_3pts_collinear_false_4 COMMAND bn_test plane_pt
1 1,1,1 6,3,8 0,0,0 0)
-add_test(NAME bn_plane_3pts_collinear_false_5 COMMAND bn_test plane_pt
1 6,3,8 1,1,1 0,0,0 0)
-add_test(NAME bn_plane_3pts_collinear_false_6 COMMAND bn_test plane_pt
1 6,3,8 0,0,0 1,1,1 0)
-add_test(NAME bn_plane_3pts_collinear_same COMMAND bn_test plane_pt
1 5.3,8.1,9.6 5.3,8.1,9.6 5.3,8.1,9.6 1)
-add_test(NAME bn_plane_3pts_collinear_partial_same_1 COMMAND bn_test plane_pt
1 6,2,4 6,2,4 9.3,8.1,4.6 1)
-add_test(NAME bn_plane_3pts_collinear_partial_same_2 COMMAND bn_test plane_pt
1 9.3,8.1,4.6 6,2,4 6,2,4 1)
-add_test(NAME bn_plane_3pts_collinear_partial_same_3 COMMAND bn_test plane_pt
1 6,2,4 9.3,8.1,4.6 6,2,4 1)
-add_test(NAME bn_plane_3pts_collinear_true_1 COMMAND bn_test plane_pt
1 1.8,4.6,2.2 5.4,13.8,6.6 16.2,41.4,19.8 1)
-add_test(NAME bn_plane_3pts_collinear_true_2 COMMAND bn_test plane_pt
1 1.8,4.6,2.2 16.2,41.4,19.8 5.4,13.8,6.6 1)
-add_test(NAME bn_plane_3pts_collinear_true_3 COMMAND bn_test plane_pt
1 5.4,13.8,6.6 1.8,4.6,2.2 16.2,41.4,19.8 1)
-add_test(NAME bn_plane_3pts_collinear_true_4 COMMAND bn_test plane_pt
1 5.4,13.8,6.6 16.2,41.4,19.8 1.8,4.6,2.2 1)
-add_test(NAME bn_plane_3pts_collinear_true_5 COMMAND bn_test plane_pt
1 16.2,41.4,19.8 1.8,4.6,2.2 5.4,13.8,6.6 1)
-add_test(NAME bn_plane_3pts_collinear_true_6 COMMAND bn_test plane_pt
1 16.2,41.4,19.8 5.4,13.8,6.6 1.8,4.6,2.2 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_false_1 COMMAND bn_test
plane_pt 1 0,0,0 1,1,1 6,3,8 0)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_false_2 COMMAND bn_test
plane_pt 1 0,0,0 6,3,8 1,1,1 0)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_false_3 COMMAND bn_test
plane_pt 1 1,1,1 0,0,0 6,3,8 0)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_false_4 COMMAND bn_test
plane_pt 1 1,1,1 6,3,8 0,0,0 0)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_false_5 COMMAND bn_test
plane_pt 1 6,3,8 1,1,1 0,0,0 0)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_false_6 COMMAND bn_test
plane_pt 1 6,3,8 0,0,0 1,1,1 0)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_same COMMAND bn_test
plane_pt 1 5.3,8.1,9.6 5.3,8.1,9.6 5.3,8.1,9.6 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_partial_same_1 COMMAND bn_test
plane_pt 1 6,2,4 6,2,4 9.3,8.1,4.6 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_partial_same_2 COMMAND bn_test
plane_pt 1 9.3,8.1,4.6 6,2,4 6,2,4 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_partial_same_3 COMMAND bn_test
plane_pt 1 6,2,4 9.3,8.1,4.6 6,2,4 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_true_1 COMMAND bn_test
plane_pt 1 1.8,4.6,2.2 5.4,13.8,6.6 16.2,41.4,19.8 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_true_2 COMMAND bn_test
plane_pt 1 1.8,4.6,2.2 16.2,41.4,19.8 5.4,13.8,6.6 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_true_3 COMMAND bn_test
plane_pt 1 5.4,13.8,6.6 1.8,4.6,2.2 16.2,41.4,19.8 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_true_4 COMMAND bn_test
plane_pt 1 5.4,13.8,6.6 16.2,41.4,19.8 1.8,4.6,2.2 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_true_5 COMMAND bn_test
plane_pt 1 16.2,41.4,19.8 1.8,4.6,2.2 5.4,13.8,6.6 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_collinear_true_6 COMMAND bn_test
plane_pt 1 16.2,41.4,19.8 5.4,13.8,6.6 1.8,4.6,2.2 1)
# For function #2 (bn_3pts_distinct), the <args> format is as follows:
#
@@ -125,16 +125,16 @@
# where P0-P2 are the points in question. An individual point
# is three integer or floating point numbers separated by commas.
-add_test(NAME bn_plane_3pts_distinct_false_all COMMAND bn_test plane_pt
2 5.3,8.6,9.1 5.3,8.6,9.1 5.3,8.6,9.1 0)
-add_test(NAME bn_plane_3pts_distinct_false_1 COMMAND bn_test plane_pt
2 5.3,8.6,9.1 5.3,8.6,9.1 8.7,4.1,9.3 0)
-add_test(NAME bn_plane_3pts_distinct_false_2 COMMAND bn_test plane_pt
2 5.3,8.6,9.1 8.7,4.1,9.3 5.3,8.6,9.1 0)
-add_test(NAME bn_plane_3pts_distinct_false_3 COMMAND bn_test plane_pt
2 8.7,4.1,9.3 5.3,8.6,9.1 5.3,8.6,9.1 0)
-add_test(NAME bn_plane_3pts_distinct_true_1 COMMAND bn_test plane_pt
2 8.7,4.1,9.3 7.5,9.2,4.1 5.3,8.6,9.1 1)
-add_test(NAME bn_plane_3pts_distinct_true_2 COMMAND bn_test plane_pt
2 8.7,4.1,9.3 5.3,8.6,9.1 7.5,9.2,4.1 1)
-add_test(NAME bn_plane_3pts_distinct_true_3 COMMAND bn_test plane_pt
2 5.3,8.6,9.1 8.7,4.1,9.3 7.5,9.2,4.1 1)
-add_test(NAME bn_plane_3pts_distinct_true_4 COMMAND bn_test plane_pt
2 5.3,8.6,9.1 7.5,9.2,4.1 8.7,4.1,9.3 1)
-add_test(NAME bn_plane_3pts_distinct_true_5 COMMAND bn_test plane_pt
2 7.5,9.2,4.1 8.7,4.1,9.3 5.3,8.6,9.1 1)
-add_test(NAME bn_plane_3pts_distinct_true_6 COMMAND bn_test plane_pt
2 7.5,9.2,4.1 5.3,8.6,9.1 8.7,4.1,9.3 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_distinct_false_all COMMAND bn_test
plane_pt 2 5.3,8.6,9.1 5.3,8.6,9.1 5.3,8.6,9.1 0)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_distinct_false_1 COMMAND bn_test
plane_pt 2 5.3,8.6,9.1 5.3,8.6,9.1 8.7,4.1,9.3 0)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_distinct_false_2 COMMAND bn_test
plane_pt 2 5.3,8.6,9.1 8.7,4.1,9.3 5.3,8.6,9.1 0)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_distinct_false_3 COMMAND bn_test
plane_pt 2 8.7,4.1,9.3 5.3,8.6,9.1 5.3,8.6,9.1 0)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_distinct_true_1 COMMAND bn_test
plane_pt 2 8.7,4.1,9.3 7.5,9.2,4.1 5.3,8.6,9.1 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_distinct_true_2 COMMAND bn_test
plane_pt 2 8.7,4.1,9.3 5.3,8.6,9.1 7.5,9.2,4.1 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_distinct_true_3 COMMAND bn_test
plane_pt 2 5.3,8.6,9.1 8.7,4.1,9.3 7.5,9.2,4.1 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_distinct_true_4 COMMAND bn_test
plane_pt 2 5.3,8.6,9.1 7.5,9.2,4.1 8.7,4.1,9.3 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_distinct_true_5 COMMAND bn_test
plane_pt 2 7.5,9.2,4.1 8.7,4.1,9.3 5.3,8.6,9.1 1)
+BRLCAD_ADD_TEST(NAME bn_plane_3pts_distinct_true_6 COMMAND bn_test
plane_pt 2 7.5,9.2,4.1 5.3,8.6,9.1 8.7,4.1,9.3 1)
# For function #3 (bn_distsq_line3_pt3), the <args> format is as follows:
#
@@ -143,10 +143,10 @@
# Where PT and DIR define the parametric line in question and A is the
# point in question.
-add_test(NAME bn_plane_distsq_line3_pt3_1 COMMAND bn_test plane_pt
3 0,0,0 1,1,1 0,0,0 0)
-add_test(NAME bn_plane_distsq_line3_pt3_2 COMMAND bn_test plane_pt
3 -1,-1,-1 1,1,1 0,0,0 0)
-add_test(NAME bn_plane_distsq_line3_pt3_3 COMMAND bn_test plane_pt
3 0,0,0 1,1,1 0,5,0 16.666666)
-add_test(NAME bn_plane_distsq_line3_pt3_4 COMMAND bn_test plane_pt
3 5,6,4 9,3,8 -5,2,4 48.441558)
+BRLCAD_ADD_TEST(NAME bn_plane_distsq_line3_pt3_1 COMMAND bn_test
plane_pt 3 0,0,0 1,1,1 0,0,0 0)
+BRLCAD_ADD_TEST(NAME bn_plane_distsq_line3_pt3_2 COMMAND bn_test
plane_pt 3 -1,-1,-1 1,1,1 0,0,0 0)
+BRLCAD_ADD_TEST(NAME bn_plane_distsq_line3_pt3_3 COMMAND bn_test
plane_pt 3 0,0,0 1,1,1 0,5,0 16.666666)
+BRLCAD_ADD_TEST(NAME bn_plane_distsq_line3_pt3_4 COMMAND bn_test
plane_pt 3 5,6,4 9,3,8 -5,2,4 48.441558)
# For function #4 (bn_distsq_pt3_lseg3_v2), the <args> format is as follows:
#
@@ -155,12 +155,12 @@
# Where A and B are the endpoints of the line segment, and P is the
# point in question.
-add_test(NAME bn_plane_distsq_pt3_lseg3_v2_case0_1 COMMAND bn_test plane_pt
4 -5,-5,-5 5,5,5 0,0,0 0 0)
-add_test(NAME bn_plane_distsq_pt3_lseg3_v2_case1_1 COMMAND bn_test plane_pt
4 -5,-5,-5 5,5,5 -5,-5,-5 1 0)
-add_test(NAME bn_plane_distsq_pt3_lseg3_v2_case2_1 COMMAND bn_test plane_pt
4 -5,-5,-5 5,5,5 5,5,5 2 0)
-add_test(NAME bn_plane_distsq_pt3_lseg3_v2_case3_1 COMMAND bn_test plane_pt
4 -5,-5,-5 5,5,5 -10,-5,-10 3 50)
-add_test(NAME bn_plane_distsq_pt3_lseg3_v2_case4_1 COMMAND bn_test plane_pt
4 -5,-5,-5 5,5,5 5,10,10 4 50)
-add_test(NAME bn_plane_distsq_pt3_lseg3_v2_case5_1 COMMAND bn_test plane_pt
4 -5,-5,-5 5,5,5 0,-5,-5 5 16.666666)
+BRLCAD_ADD_TEST(NAME bn_plane_distsq_pt3_lseg3_v2_case0_1 COMMAND bn_test
plane_pt 4 -5,-5,-5 5,5,5 0,0,0 0 0)
+BRLCAD_ADD_TEST(NAME bn_plane_distsq_pt3_lseg3_v2_case1_1 COMMAND bn_test
plane_pt 4 -5,-5,-5 5,5,5 -5,-5,-5 1 0)
+BRLCAD_ADD_TEST(NAME bn_plane_distsq_pt3_lseg3_v2_case2_1 COMMAND bn_test
plane_pt 4 -5,-5,-5 5,5,5 5,5,5 2 0)
+BRLCAD_ADD_TEST(NAME bn_plane_distsq_pt3_lseg3_v2_case3_1 COMMAND bn_test
plane_pt 4 -5,-5,-5 5,5,5 -10,-5,-10 3 50)
+BRLCAD_ADD_TEST(NAME bn_plane_distsq_pt3_lseg3_v2_case4_1 COMMAND bn_test
plane_pt 4 -5,-5,-5 5,5,5 5,10,10 4 50)
+BRLCAD_ADD_TEST(NAME bn_plane_distsq_pt3_lseg3_v2_case5_1 COMMAND bn_test
plane_pt 4 -5,-5,-5 5,5,5 0,-5,-5 5 16.666666)
# For function #5 (bn_mk_plane_3pts), the <args> format is as follows:
#
@@ -169,11 +169,11 @@
# Where A, B, and C are the points in question. This test function
# does not currently support checking the resultant plane.
-add_test(NAME bn_plane_mk_plane_3pts_fail_same COMMAND bn_test plane_pt
5 0,0,0 0,0,0 0,0,0 -1)
-add_test(NAME bn_plane_mk_plane_3pts_fail_collinear_1 COMMAND bn_test plane_pt
5 0,0,0 5,8,2 0,0,0 -1)
-add_test(NAME bn_plane_mk_plane_3pts_fail_collinear_2 COMMAND bn_test plane_pt
5 5,8,2 0,0,0 0,0,0 -1)
-add_test(NAME bn_plane_mk_plane_3pts_fail_collinear_3 COMMAND bn_test plane_pt
5 -10,-10,-10 0,0,0 5,5,5 -1)
-add_test(NAME bn_plane_mk_plane_3pts_succeed COMMAND bn_test plane_pt
5 -10,-10,-10 7,3,8 19,4,2 0)
+BRLCAD_ADD_TEST(NAME bn_plane_mk_plane_3pts_fail_same COMMAND bn_test
plane_pt 5 0,0,0 0,0,0 0,0,0 -1)
+BRLCAD_ADD_TEST(NAME bn_plane_mk_plane_3pts_fail_collinear_1 COMMAND bn_test
plane_pt 5 0,0,0 5,8,2 0,0,0 -1)
+BRLCAD_ADD_TEST(NAME bn_plane_mk_plane_3pts_fail_collinear_2 COMMAND bn_test
plane_pt 5 5,8,2 0,0,0 0,0,0 -1)
+BRLCAD_ADD_TEST(NAME bn_plane_mk_plane_3pts_fail_collinear_3 COMMAND bn_test
plane_pt 5 -10,-10,-10 0,0,0 5,5,5 -1)
+BRLCAD_ADD_TEST(NAME bn_plane_mk_plane_3pts_succeed COMMAND bn_test
plane_pt 5 -10,-10,-10 7,3,8 19,4,2 0)
# For COMMAND bn_test plane_dist, the input format is as follows:
@@ -188,9 +188,9 @@
# question. An individual point is three integer or floating point
# numbers separated by commas.
-add_test(NAME bn_plane_dist_pt3_line3_case0_1 COMMAND bn_test plane_dist 2
-5,-5,-5 1,1,1 -5,-5,-5 0 0 -5,-5,-5)
-add_test(NAME bn_plane_dist_pt3_line3_case1_1 COMMAND bn_test plane_dist 2
-5,-5,-5 1,1,1 0,0,0 1 0.5 0,0,0)
-add_test(NAME bn_plane_dist_pt3_line3_case2_1 COMMAND bn_test plane_dist 2
-5,-5,-5 5,5,5 0,-5,-5 2 4.08248 -3.33333,-3.33333,-3.33333)
+BRLCAD_ADD_TEST(NAME bn_plane_dist_pt3_line3_case0_1 COMMAND bn_test
plane_dist 2 -5,-5,-5 1,1,1 -5,-5,-5 0 0 -5,-5,-5)
+BRLCAD_ADD_TEST(NAME bn_plane_dist_pt3_line3_case1_1 COMMAND bn_test
plane_dist 2 -5,-5,-5 1,1,1 0,0,0 1 0.5 0,0,0)
+BRLCAD_ADD_TEST(NAME bn_plane_dist_pt3_line3_case2_1 COMMAND bn_test
plane_dist 2 -5,-5,-5 5,5,5 0,-5,-5 2 4.08248 -3.33333,-3.33333,-3.33333)
# For function #2 (bn_dist_pt3_lseg3), the <args> format is as follows:
#
@@ -200,12 +200,12 @@
# question. An individual point is three integer or floating point
# numbers separated by commas.
-add_test(NAME bn_plane_dist_pt3_lseg3_case0_1 COMMAND bn_test plane_dist 2
-5,-5,-5 5,5,5 0,0,0 0 0.5 0,0,0)
-add_test(NAME bn_plane_dist_pt3_lseg3_case1_1 COMMAND bn_test plane_dist 2
-5,-5,-5 5,5,5 -5,-5,-5 1 0 -5,-5,-5)
-add_test(NAME bn_plane_dist_pt3_lseg3_case2_1 COMMAND bn_test plane_dist 2
-5,-5,-5 5,5,5 5,5,5 2 0 5,5,5)
-add_test(NAME bn_plane_dist_pt3_lseg3_case3_1 COMMAND bn_test plane_dist 2
-5,-5,-5 5,5,5 -10,-5,-10 3 7.07107 -5,-5,-5)
-add_test(NAME bn_plane_dist_pt3_lseg3_case4_1 COMMAND bn_test plane_dist 2
-5,-5,-5 5,5,5 5,10,10 4 7.07107 5,5,5)
-add_test(NAME bn_plane_dist_pt3_lseg3_case5_1 COMMAND bn_test plane_dist 2
-5,-5,-5 5,5,5 0,-5,-5 5 4.08248 -3.33333,-3.33333,-3.33333)
+BRLCAD_ADD_TEST(NAME bn_plane_dist_pt3_lseg3_case0_1 COMMAND bn_test
plane_dist 2 -5,-5,-5 5,5,5 0,0,0 0 0.5 0,0,0)
+BRLCAD_ADD_TEST(NAME bn_plane_dist_pt3_lseg3_case1_1 COMMAND bn_test
plane_dist 2 -5,-5,-5 5,5,5 -5,-5,-5 1 0 -5,-5,-5)
+BRLCAD_ADD_TEST(NAME bn_plane_dist_pt3_lseg3_case2_1 COMMAND bn_test
plane_dist 2 -5,-5,-5 5,5,5 5,5,5 2 0 5,5,5)
+BRLCAD_ADD_TEST(NAME bn_plane_dist_pt3_lseg3_case3_1 COMMAND bn_test
plane_dist 2 -5,-5,-5 5,5,5 -10,-5,-10 3 7.07107 -5,-5,-5)
+BRLCAD_ADD_TEST(NAME bn_plane_dist_pt3_lseg3_case4_1 COMMAND bn_test
plane_dist 2 -5,-5,-5 5,5,5 5,10,10 4 7.07107 5,5,5)
+BRLCAD_ADD_TEST(NAME bn_plane_dist_pt3_lseg3_case5_1 COMMAND bn_test
plane_dist 2 -5,-5,-5 5,5,5 0,-5,-5 5 4.08248 -3.33333,-3.33333,-3.33333)
# For function #3 (bn_dist_pt3_pt3), the <args> format is as follows:
#
@@ -214,8 +214,8 @@
# where A and B are the points in question. An individual point is
# three integer or floating point numbers separated by commas.
-add_test(NAME bn_plane_dist_pt3_pt3_same COMMAND bn_test plane_dist 3 0,0,0
0,0,0 0)
-add_test(NAME bn_plane_dist_pt3_pt3_1 COMMAND bn_test plane_dist 3 0,0,0
1,1,1 1.732051)
+BRLCAD_ADD_TEST(NAME bn_plane_dist_pt3_pt3_same COMMAND bn_test plane_dist 3
0,0,0 0,0,0 0)
+BRLCAD_ADD_TEST(NAME bn_plane_dist_pt3_pt3_1 COMMAND bn_test plane_dist 3
0,0,0 1,1,1 1.732051)
# For COMMAND bn_test plane_isect, the input format is as follows:
#
@@ -229,14 +229,14 @@
# line segment. An individual point is three integer or floating point
# numbers separated by commas.
-add_test(NAME bn_plane_isect_line_lseg_case-4_1 COMMAND bn_test plane_isect
1 -5,-5,-5 1,1,1 0,0,0 0,0,0 -4 0)
-add_test(NAME bn_plane_isect_line_lseg_case-3_1 COMMAND bn_test plane_isect
1 -5,-5,-5 1,1,1 0,0,1 0,0,5 -3 8.660)
-add_test(NAME bn_plane_isect_line_lseg_case-2_1 COMMAND bn_test plane_isect
1 -5,-5,-5 1,1,1 0,0,-5 0,0,-1 -2 8.660)
-add_test(NAME bn_plane_isect_line_lseg_case-1_1 COMMAND bn_test plane_isect
1 -5,-5,-5 1,1,1 -5,-5,-6 0,0,-1 -1 0)
-add_test(NAME bn_plane_isect_line_lseg_case0_1 COMMAND bn_test plane_isect
1 -5,-5,-5 1,1,1 1,1,1 5,5,5 0 10.392)
-add_test(NAME bn_plane_isect_line_lseg_case1_1 COMMAND bn_test plane_isect
1 -5,-5,-5 1,1,1 0,0,0 0,0,5 1 8.660)
-add_test(NAME bn_plane_isect_line_lseg_case2_1 COMMAND bn_test plane_isect
1 -5,-5,-5 1,1,1 0,0,-5 0,0,0 2 8.660)
-add_test(NAME bn_plane_isect_line_lseg_case3_1 COMMAND bn_test plane_isect
1 -5,-5,-5 1,1,1 0,0,-5 0,0,5 3 8.660)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_line_lseg_case-4_1 COMMAND bn_test
plane_isect 1 -5,-5,-5 1,1,1 0,0,0 0,0,0 -4 0)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_line_lseg_case-3_1 COMMAND bn_test
plane_isect 1 -5,-5,-5 1,1,1 0,0,1 0,0,5 -3 8.660)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_line_lseg_case-2_1 COMMAND bn_test
plane_isect 1 -5,-5,-5 1,1,1 0,0,-5 0,0,-1 -2 8.660)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_line_lseg_case-1_1 COMMAND bn_test
plane_isect 1 -5,-5,-5 1,1,1 -5,-5,-6 0,0,-1 -1 0)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_line_lseg_case0_1 COMMAND bn_test
plane_isect 1 -5,-5,-5 1,1,1 1,1,1 5,5,5 0 10.392)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_line_lseg_case1_1 COMMAND bn_test
plane_isect 1 -5,-5,-5 1,1,1 0,0,0 0,0,5 1 8.660)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_line_lseg_case2_1 COMMAND bn_test
plane_isect 1 -5,-5,-5 1,1,1 0,0,-5 0,0,0 2 8.660)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_line_lseg_case3_1 COMMAND bn_test
plane_isect 1 -5,-5,-5 1,1,1 0,0,-5 0,0,5 3 8.660)
# For function #2 (bn_isect_lseg3_lseg3), the <args> format is as follows:
#
@@ -248,14 +248,14 @@
# individual point is three integer or floating point numbers
# separated by commas.
-add_test(NAME bn_plane_isect_lseg3_lseg3_case-3_1 COMMAND bn_test
plane_isect 2 0,0,0 0,1,1 0,0,1 0,-1,1 -3 0.5 -0.5)
-add_test(NAME bn_plane_isect_lseg3_lseg3_case-3_2 COMMAND bn_test
plane_isect 2 0,0,0 0,1,1 0,1,0 0,-0.25,0.25 -3 0.5 2)
-add_test(NAME bn_plane_isect_lseg3_lseg3_case-2_1 COMMAND bn_test
plane_isect 2 0,0,0 0,1,1 1,1,1 0,1,1 -2 0 0)
-add_test(NAME bn_plane_isect_lseg3_lseg3_case-1_1 COMMAND bn_test
plane_isect 2 -5,-5,-5 3,3,3 0,0,0 -1,-1,-1 -1 1.666667 1.333333)
-add_test(NAME bn_plane_isect_lseg3_lseg3_case0_1 COMMAND bn_test
plane_isect 2 -5,-5,-5 3,3,3 0,0,0 -2,-2,-2 0 1.666667 1)
-add_test(NAME bn_plane_isect_lseg3_lseg3_case0_2 COMMAND bn_test
plane_isect 2 -5,-5,-5 3,3,3 0,0,0 -3,-3,-3 0 1.666667 0.666667)
-add_test(NAME bn_plane_isect_lseg3_lseg3_case0_3 COMMAND bn_test
plane_isect 2 -5,-5,-5 5,5,5 -4,-4,-4 2,2,2 0 0.2 0.6)
-add_test(NAME bn_plane_isect_lseg3_lseg3_case1_1 COMMAND bn_test
plane_isect 2 0,0,0 0,1,1 0,1,0 0,-1,1 1 0.5 0.5)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_lseg3_lseg3_case-3_1 COMMAND bn_test
plane_isect 2 0,0,0 0,1,1 0,0,1 0,-1,1 -3 0.5 -0.5)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_lseg3_lseg3_case-3_2 COMMAND bn_test
plane_isect 2 0,0,0 0,1,1 0,1,0 0,-0.25,0.25 -3 0.5 2)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_lseg3_lseg3_case-2_1 COMMAND bn_test
plane_isect 2 0,0,0 0,1,1 1,1,1 0,1,1 -2 0 0)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_lseg3_lseg3_case-1_1 COMMAND bn_test
plane_isect 2 -5,-5,-5 3,3,3 0,0,0 -1,-1,-1 -1 1.666667 1.333333)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_lseg3_lseg3_case0_1 COMMAND bn_test
plane_isect 2 -5,-5,-5 3,3,3 0,0,0 -2,-2,-2 0 1.666667 1)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_lseg3_lseg3_case0_2 COMMAND bn_test
plane_isect 2 -5,-5,-5 3,3,3 0,0,0 -3,-3,-3 0 1.666667 0.666667)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_lseg3_lseg3_case0_3 COMMAND bn_test
plane_isect 2 -5,-5,-5 5,5,5 -4,-4,-4 2,2,2 0 0.2 0.6)
+BRLCAD_ADD_TEST(NAME bn_plane_isect_lseg3_lseg3_case1_1 COMMAND bn_test
plane_isect 2 0,0,0 0,1,1 0,1,0 0,-1,1 1 0.5 0.5)
#
# ************ complex.c tests *************
@@ -271,11 +271,11 @@
# where AP and BP are the numbers in question. An individual complex
# number is two integer or floating point numbers separated by commas.
-add_test(NAME bn_cx_div_same_1 COMMAND bn_test complex 1 1,3 1,3 1,0)
-add_test(NAME bn_cx_div_same_2 COMMAND bn_test complex 1 3,1 3,1 1,0)
-add_test(NAME bn_cx_div_dif_1 COMMAND bn_test complex 1 6.3,4.2
9.8,7.7 0.605678,-0.0473186)
-add_test(NAME bn_cx_div_dif_2 COMMAND bn_test complex 1 0,0 1,1 0,0)
-add_test(NAME bn_cx_div_by_0_1 COMMAND bn_test complex 1 1,1 0,0
1.0e20,1.0e20)
+BRLCAD_ADD_TEST(NAME bn_cx_div_same_1 COMMAND bn_test complex 1 1,3
1,3 1,0)
+BRLCAD_ADD_TEST(NAME bn_cx_div_same_2 COMMAND bn_test complex 1 3,1
3,1 1,0)
+BRLCAD_ADD_TEST(NAME bn_cx_div_dif_1 COMMAND bn_test complex 1
6.3,4.2 9.8,7.7 0.605678,-0.0473186)
+BRLCAD_ADD_TEST(NAME bn_cx_div_dif_2 COMMAND bn_test complex 1 0,0
1,1 0,0)
+BRLCAD_ADD_TEST(NAME bn_cx_div_by_0_1 COMMAND bn_test complex 1 1,1
0,0 1.0e20,1.0e20)
# For function #2 (bn_cx_mul/bn_cx_mul2), the <args> format is as follows:
#
@@ -284,10 +284,10 @@
# where AP and BP are the numbers in question. An individual complex
# number is two integer or floating point numbers separated by commas.
-add_test(NAME bn_cx_mul_0_1 COMMAND bn_test complex 2 5.2,3.8 0,0
0,0)
-add_test(NAME bn_cx_mul_0_2 COMMAND bn_test complex 2 0,0 5.2,3.8
0,0)
-add_test(NAME bn_cx_mul_inv_1 COMMAND bn_test complex 2 7.4,2.3
0.123231,-0.0383014 1,0)
-add_test(NAME bn_cx_mul_inv_2 COMMAND bn_test complex 2
0.123231,-0.0383014 7.4,2.3 1,0)
+BRLCAD_ADD_TEST(NAME bn_cx_mul_0_1 COMMAND bn_test complex 2 5.2,3.8
0,0 0,0)
+BRLCAD_ADD_TEST(NAME bn_cx_mul_0_2 COMMAND bn_test complex 2 0,0
5.2,3.8 0,0)
+BRLCAD_ADD_TEST(NAME bn_cx_mul_inv_1 COMMAND bn_test complex 2 7.4,2.3
0.123231,-0.0383014 1,0)
+BRLCAD_ADD_TEST(NAME bn_cx_mul_inv_2 COMMAND bn_test complex 2
0.123231,-0.0383014 7.4,2.3 1,0)
# For function #3 (bn_cx_sub), the <args> format is as follows:
#
@@ -296,11 +296,11 @@
# where AP and BP are the numbers in question. An individual complex
# number is two integer or floating point numbers separated by commas.
-add_test(NAME bn_cx_sub_0_1 COMMAND bn_test complex 3 5.2,3.8 0,0
5.2,3.8)
-add_test(NAME bn_cx_sub_0_2 COMMAND bn_test complex 3 0,0 5.2,3.8
-5.2,-3.8)
-add_test(NAME bn_cx_sub_same_1 COMMAND bn_test complex 3 1.4,2.9
1.4,2.9 0,0)
-add_test(NAME bn_cx_sub_dif_1 COMMAND bn_test complex 3 7.4,-2.3
8.9,6.4 -1.5,-8.7)
-add_test(NAME bn_cx_sub_dif_2 COMMAND bn_test complex 3 8.9,6.4
7.4,-2.3 1.5,8.7)
+BRLCAD_ADD_TEST(NAME bn_cx_sub_0_1 COMMAND bn_test complex 3 5.2,3.8
0,0 5.2,3.8)
+BRLCAD_ADD_TEST(NAME bn_cx_sub_0_2 COMMAND bn_test complex 3 0,0
5.2,3.8 -5.2,-3.8)
+BRLCAD_ADD_TEST(NAME bn_cx_sub_same_1 COMMAND bn_test complex 3 1.4,2.9
1.4,2.9 0,0)
+BRLCAD_ADD_TEST(NAME bn_cx_sub_dif_1 COMMAND bn_test complex 3
7.4,-2.3 8.9,6.4 -1.5,-8.7)
+BRLCAD_ADD_TEST(NAME bn_cx_sub_dif_2 COMMAND bn_test complex 3 8.9,6.4
7.4,-2.3 1.5,8.7)
# For function #4 (bn_cx_add), the <args> format is as follows:
#
@@ -309,11 +309,11 @@
# where AP and BP are the numbers in question. An individual complex
# number is two integer or floating point numbers separated by commas.
-add_test(NAME bn_cx_add_0_1 COMMAND bn_test complex 4 5.2,3.8 0,0
5.2,3.8)
-add_test(NAME bn_cx_add_0_2 COMMAND bn_test complex 4 0,0 5.2,3.8
5.2,3.8)
-add_test(NAME bn_cx_add_inv_1 COMMAND bn_test complex 4 1.4,2.9
-1.4,-2.9 0,0)
-add_test(NAME bn_cx_add_dif_1 COMMAND bn_test complex 4 7.4,-2.3
8.9,6.4 16.3,4.1)
-add_test(NAME bn_cx_add_dif_2 COMMAND bn_test complex 4 8.9,6.4
7.4,-2.3 16.3,4.1)
+BRLCAD_ADD_TEST(NAME bn_cx_add_0_1 COMMAND bn_test complex 4 5.2,3.8
0,0 5.2,3.8)
+BRLCAD_ADD_TEST(NAME bn_cx_add_0_2 COMMAND bn_test complex 4 0,0
5.2,3.8 5.2,3.8)
+BRLCAD_ADD_TEST(NAME bn_cx_add_inv_1 COMMAND bn_test complex 4 1.4,2.9
-1.4,-2.9 0,0)
+BRLCAD_ADD_TEST(NAME bn_cx_add_dif_1 COMMAND bn_test complex 4
7.4,-2.3 8.9,6.4 16.3,4.1)
+BRLCAD_ADD_TEST(NAME bn_cx_add_dif_2 COMMAND bn_test complex 4 8.9,6.4
7.4,-2.3 16.3,4.1)
# For function #5 (bn_cx_sqrt), the <args> format is as follows:
#
@@ -322,11 +322,11 @@
# where IP is the number in question. An individual complex number is
# two integer or floating point numbers separated by commas.
-add_test(NAME bn_cx_sqrt_1 COMMAND bn_test complex 5 0,2 1,1)
-add_test(NAME bn_cx_sqrt_2 COMMAND bn_test complex 5 2,0
1.414214,0)
-add_test(NAME bn_cx_sqrt_3 COMMAND bn_test complex 5 0,0 0,0)
-add_test(NAME bn_cx_sqrt_4 COMMAND bn_test complex 5 6.3,4.2
2.63360,0.797389)
-add_test(NAME bn_cx_sqrt_5 COMMAND bn_test complex 5 9.8,7.7
3.33640,1.15394)
+BRLCAD_ADD_TEST(NAME bn_cx_sqrt_1 COMMAND bn_test complex 5 0,2
1,1)
+BRLCAD_ADD_TEST(NAME bn_cx_sqrt_2 COMMAND bn_test complex 5 2,0
1.414214,0)
+BRLCAD_ADD_TEST(NAME bn_cx_sqrt_3 COMMAND bn_test complex 5 0,0
0,0)
+BRLCAD_ADD_TEST(NAME bn_cx_sqrt_4 COMMAND bn_test complex 5 6.3,4.2
2.63360,0.797389)
+BRLCAD_ADD_TEST(NAME bn_cx_sqrt_5 COMMAND bn_test complex 5 9.8,7.7
3.33640,1.15394)
# For function #6 (bn_cx_neg), the <args> format is as follows:
#
@@ -335,10 +335,10 @@
# where IP is the number in question. An individual complex number is
# two integer or floating point numbers separated by commas.
-add_test(NAME bn_cx_neg_0_1 COMMAND bn_test complex 6 0,0 0,0)
-add_test(NAME bn_cx_neg_0_2 COMMAND bn_test complex 6 2,0 -2,0)
-add_test(NAME bn_cx_neg_0_3 COMMAND bn_test complex 6 0,2 0,-2)
-add_test(NAME bn_cx_neg_dif_1 COMMAND bn_test complex 6 6.3,4.2
-6.3,-4.2)
+BRLCAD_ADD_TEST(NAME bn_cx_neg_0_1 COMMAND bn_test complex 6 0,0
0,0)
+BRLCAD_ADD_TEST(NAME bn_cx_neg_0_2 COMMAND bn_test complex 6 2,0
-2,0)
+BRLCAD_ADD_TEST(NAME bn_cx_neg_0_3 COMMAND bn_test complex 6 0,2
0,-2)
+BRLCAD_ADD_TEST(NAME bn_cx_neg_dif_1 COMMAND bn_test complex 6 6.3,4.2
-6.3,-4.2)
# For function #7 (bn_cx_conj), the <args> format is as follows:
#
@@ -347,10 +347,10 @@
# where IP is the number in question. An individual complex number is
# two integer or floating point numbers separated by commas.
-add_test(NAME bn_cx_conj_0_1 COMMAND bn_test complex 7 0,0 0,0)
-add_test(NAME bn_cx_conj_0_2 COMMAND bn_test complex 7 2,0 2,0)
-add_test(NAME bn_cx_conj_0_3 COMMAND bn_test complex 7 0,2 0,-2)
-add_test(NAME bn_cx_conj_dif_1 COMMAND bn_test complex 7 6.3,4.2
6.3,-4.2)
+BRLCAD_ADD_TEST(NAME bn_cx_conj_0_1 COMMAND bn_test complex 7 0,0
0,0)
+BRLCAD_ADD_TEST(NAME bn_cx_conj_0_2 COMMAND bn_test complex 7 2,0
2,0)
+BRLCAD_ADD_TEST(NAME bn_cx_conj_0_3 COMMAND bn_test complex 7 0,2
0,-2)
+BRLCAD_ADD_TEST(NAME bn_cx_conj_dif_1 COMMAND bn_test complex 7 6.3,4.2
6.3,-4.2)
# For function #8 (bn_cx_real/bn_cx_imag), the <args> format is as follows:
#
@@ -359,9 +359,9 @@
# where IP is the number in question. An individual complex number is
# two integer or floating point numbers separated by commas.
-add_test(NAME bn_cx_parts_1 COMMAND bn_test complex 8 0,0 0,0)
-add_test(NAME bn_cx_parts_2 COMMAND bn_test complex 8 1,2 1,2)
-add_test(NAME bn_cx_parts_3 COMMAND bn_test complex 8 2,1 2,1)
+BRLCAD_ADD_TEST(NAME bn_cx_parts_1 COMMAND bn_test complex 8 0,0
0,0)
+BRLCAD_ADD_TEST(NAME bn_cx_parts_2 COMMAND bn_test complex 8 1,2
1,2)
+BRLCAD_ADD_TEST(NAME bn_cx_parts_3 COMMAND bn_test complex 8 2,1
2,1)
#
@@ -381,13 +381,13 @@
# where M1 is the first matrix, M2 is the second matrix.
# A matrix is 16 floating point numbers separated by commas.
-add_test(NAME bn_mat_mul_0_1 COMMAND bn_test mat 1
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1.0,2.1,3.3,4.4,5.5,6.6,7.7,8.8,9.9,10.1,11.11,12.12,13.13,14.14,15.15,16.16
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
-add_test(NAME bn_mat_mul_0_2 COMMAND bn_test mat 1
2.8,1.7,3205.555,87.76,55.0,66.0,77.0,0.0,0.0,10.1,46.8,537.999,13.0,14.0,15.0,24382.5373
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
-add_test(NAME bn_mat_mul_id_1 COMMAND bn_test mat 1
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
33.34,28.7135672,44.84,55.85,1,1,0,0,0,7843.4444,11,12,473.232,83.17,75.0,8.417
33.34,28.7135672,44.84,55.85,1,1,0,0,0,7843.4444,11,12,473.232,83.17,75.0,8.417)
-add_test(NAME bn_mat_mul_id_2 COMMAND bn_test mat 1
3688.701794246889,5712.945961512324,8172.282142910184,5109.8260742578495,2697.196099611537,2586.742536023153,5067.2882336104285,1149.9923643570387,6827.968448547921,9548.849169087358,5418.682604729545,9117.6798488191,5478.474626204755,7525.19019682893,3172.945417883698,8609.907811093646
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
3688.701794246889,5712.945961512324,8172.282142910184,5109.8260742578495,2697.196099611537,2586.742536023153,5067.2882336104285,1149.9923643570387,6827.968448547921,9548.849169087358,5418.682604729545,9117.6798488191,5478.474626204755,7525.19019682893,3172.945417883698,8609.907811093646)
-add_test(NAME bn_mat_mul_id_id COMMAND bn_test mat 1
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1)
-add_test(NAME bn_mat_mul_dif_1 COMMAND bn_test mat 1
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1
80,70,60,50,240,214,188,162,400,358,316,274,560,502,444,386)
-add_test(NAME bn_mat_mul_dif_2 COMMAND bn_test mat 1
3.2,62.9,53.0,71.5,98.6,75.4,9.6,89.9,37.7,49.0,60.2,55.2,27.8,40.2,0.5,78.1
37.1,73.1,4.9,72.1,68.2,64.7,75.7,87.4,85.8,45.0,94.5,30.8,95.9,45.9,45.4,49.1
15812.75,9970.4,13031.81,10871.23,18245.43,16644.45,11179.58,18408.79,15199.31,11168.85,12089.01,11565.25,11305.71,8240.41,6772.35,9367.97)
+BRLCAD_ADD_TEST(NAME bn_mat_mul_0_1 COMMAND bn_test mat 1
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1.0,2.1,3.3,4.4,5.5,6.6,7.7,8.8,9.9,10.1,11.11,12.12,13.13,14.14,15.15,16.16
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+BRLCAD_ADD_TEST(NAME bn_mat_mul_0_2 COMMAND bn_test mat 1
2.8,1.7,3205.555,87.76,55.0,66.0,77.0,0.0,0.0,10.1,46.8,537.999,13.0,14.0,15.0,24382.5373
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+BRLCAD_ADD_TEST(NAME bn_mat_mul_id_1 COMMAND bn_test mat 1
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
33.34,28.7135672,44.84,55.85,1,1,0,0,0,7843.4444,11,12,473.232,83.17,75.0,8.417
33.34,28.7135672,44.84,55.85,1,1,0,0,0,7843.4444,11,12,473.232,83.17,75.0,8.417)
+BRLCAD_ADD_TEST(NAME bn_mat_mul_id_2 COMMAND bn_test mat 1
3688.701794246889,5712.945961512324,8172.282142910184,5109.8260742578495,2697.196099611537,2586.742536023153,5067.2882336104285,1149.9923643570387,6827.968448547921,9548.849169087358,5418.682604729545,9117.6798488191,5478.474626204755,7525.19019682893,3172.945417883698,8609.907811093646
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
3688.701794246889,5712.945961512324,8172.282142910184,5109.8260742578495,2697.196099611537,2586.742536023153,5067.2882336104285,1149.9923643570387,6827.968448547921,9548.849169087358,5418.682604729545,9117.6798488191,5478.474626204755,7525.19019682893,3172.945417883698,8609.907811093646)
+BRLCAD_ADD_TEST(NAME bn_mat_mul_id_id COMMAND bn_test mat 1
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_mul_dif_1 COMMAND bn_test mat 1
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1
80,70,60,50,240,214,188,162,400,358,316,274,560,502,444,386)
+BRLCAD_ADD_TEST(NAME bn_mat_mul_dif_2 COMMAND bn_test mat 1
3.2,62.9,53.0,71.5,98.6,75.4,9.6,89.9,37.7,49.0,60.2,55.2,27.8,40.2,0.5,78.1
37.1,73.1,4.9,72.1,68.2,64.7,75.7,87.4,85.8,45.0,94.5,30.8,95.9,45.9,45.4,49.1
15812.75,9970.4,13031.81,10871.23,18245.43,16644.45,11179.58,18408.79,15199.31,11168.85,12089.01,11565.25,11305.71,8240.41,6772.35,9367.97)
# For function #2 (bn_mat_mul3), the <args> format is as follows:
#
@@ -396,10 +396,10 @@
# where M1 M2 M3 are the three matrices to be multiplied.
# A matrix is 16 floating point numbers separated by commas.
-add_test(NAME bn_mat_mul3_0_1 COMMAND bn_test mat 2
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
-add_test(NAME bn_mat_mul3_0_id COMMAND bn_test mat 2
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
-add_test(NAME bn_mat_mul3_id_1 COMMAND bn_test mat 2
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1
80,70,60,50,240,214,188,162,400,358,316,274,560,502,444,386)
-add_test(NAME bn_mat_mul3_dif COMMAND bn_test mat 2
3.1,4.2,1.9,1.8,2.9,0.3,4.1,4.5,2.9,2.7,0.7,1.7,1.6,0.8,4.5,5.0
1.1,2.1,2.3,3.5,2.7,1.8,2.6,3.8,1.5,0.7,3.0,4.4,2.3,0.3,4.5,4.3
3.2,2.0,2.6,0.0,2.1,4.0,0.5,1.6,4.3,3.1,2.7,4.7,0.9,3.3,2.4,4.7
278.616,347.578,253.473,376.876,304.197,369.044,283.557,434.156,203.015,252.984,183.327,274.048,315.303,376.398,294.975,446.11)
+BRLCAD_ADD_TEST(NAME bn_mat_mul3_0_1 COMMAND bn_test mat 2
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+BRLCAD_ADD_TEST(NAME bn_mat_mul3_0_id COMMAND bn_test mat 2
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+BRLCAD_ADD_TEST(NAME bn_mat_mul3_id_1 COMMAND bn_test mat 2
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1
80,70,60,50,240,214,188,162,400,358,316,274,560,502,444,386)
+BRLCAD_ADD_TEST(NAME bn_mat_mul3_dif COMMAND bn_test mat 2
3.1,4.2,1.9,1.8,2.9,0.3,4.1,4.5,2.9,2.7,0.7,1.7,1.6,0.8,4.5,5.0
1.1,2.1,2.3,3.5,2.7,1.8,2.6,3.8,1.5,0.7,3.0,4.4,2.3,0.3,4.5,4.3
3.2,2.0,2.6,0.0,2.1,4.0,0.5,1.6,4.3,3.1,2.7,4.7,0.9,3.3,2.4,4.7
278.616,347.578,253.473,376.876,304.197,369.044,283.557,434.156,203.015,252.984,183.327,274.048,315.303,376.398,294.975,446.11)
# For function #3 (bn_mat_mul4), the <args> format is as follows:
#
@@ -408,10 +408,10 @@
# where M1 M2 M3 M4 are the four matrices to be multiplied.
# A matrix is 16 floating point numbers separated by commas.
-add_test(NAME bn_mat_mul4_id_4 COMMAND bn_test mat 3
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1)
-add_test(NAME bn_mat_mul4_0_4 COMMAND bn_test mat 3
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
-add_test(NAME bn_mat_mul4_id_0 COMMAND bn_test mat 3
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
-add_test(NAME bn_mat_mul4_same COMMAND bn_test mat 3
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
113960,129040,144120,159200,263272,298128,332984,367840,412584,467216,521848,576480,561896,636304,710712,785120)
+BRLCAD_ADD_TEST(NAME bn_mat_mul4_id_4 COMMAND bn_test mat 3
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_mul4_0_4 COMMAND bn_test mat 3
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+BRLCAD_ADD_TEST(NAME bn_mat_mul4_id_0 COMMAND bn_test mat 3
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+BRLCAD_ADD_TEST(NAME bn_mat_mul4_same COMMAND bn_test mat 3
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
113960,129040,144120,159200,263272,298128,332984,367840,412584,467216,521848,576480,561896,636304,710712,785120)
# For function #4 (bn_matXvec), the <args> format is as follows:
#
@@ -422,12 +422,12 @@
# A matrix is 16 floating point numbers separated by commas.
# A vector is 4 floating point numbers separated by commas.
-add_test(NAME bn_matXvec_id COMMAND bn_test mat 4
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 2.78,3.45,16.7,38.22 2.78,3.45,16.7,38.22)
-add_test(NAME bn_matXvec_0_1 COMMAND bn_test mat 4
18.59,25.82,46.39,16.56,46.13,22.16,29.66,92.89,67.58,79.96,59.47,51.4,55.83,48.5,82.51,73.52
0,0,0,0 0,0,0,0)
-add_test(NAME bn_matXvec_0_2 COMMAND bn_test mat 4
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1.1,2.2,3.3,4.4 0,0,0,0)
-add_test(NAME bn_matXvec_dif_1 COMMAND bn_test mat 4
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 1,2,3,4 30,70,110,150)
-add_test(NAME bn_matXvec_dif_2 COMMAND bn_test mat 4
0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 0,1,2,3 14,38,62,86)
-add_test(NAME bn_matXvec_dif_3 COMMAND bn_test mat 4
18.59,25.82,46.39,16.56,46.13,22.16,29.66,92.89,67.58,79.96,59.47,51.4,55.83,48.5,82.51,73.52
7.31,68.38,65.97,3.26 5015.7984,4112.0027,10052.4745,9407.4072)
+BRLCAD_ADD_TEST(NAME bn_matXvec_id COMMAND bn_test mat 4
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 2.78,3.45,16.7,38.22 2.78,3.45,16.7,38.22)
+BRLCAD_ADD_TEST(NAME bn_matXvec_0_1 COMMAND bn_test mat 4
18.59,25.82,46.39,16.56,46.13,22.16,29.66,92.89,67.58,79.96,59.47,51.4,55.83,48.5,82.51,73.52
0,0,0,0 0,0,0,0)
+BRLCAD_ADD_TEST(NAME bn_matXvec_0_2 COMMAND bn_test mat 4
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1.1,2.2,3.3,4.4 0,0,0,0)
+BRLCAD_ADD_TEST(NAME bn_matXvec_dif_1 COMMAND bn_test mat 4
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 1,2,3,4 30,70,110,150)
+BRLCAD_ADD_TEST(NAME bn_matXvec_dif_2 COMMAND bn_test mat 4
0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 0,1,2,3 14,38,62,86)
+BRLCAD_ADD_TEST(NAME bn_matXvec_dif_3 COMMAND bn_test mat 4
18.59,25.82,46.39,16.56,46.13,22.16,29.66,92.89,67.58,79.96,59.47,51.4,55.83,48.5,82.51,73.52
7.31,68.38,65.97,3.26 5015.7984,4112.0027,10052.4745,9407.4072)
# For function #5 (bn_mat_inverse), the <args> format is as follows:
#
@@ -437,11 +437,11 @@
# M is the matrix to be inverted.
# A matrix is 16 floating point numbers separated by commas.
-add_test(NAME bn_mat_inverse_0 COMMAND bn_test mat 5 1
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
-add_test(NAME bn_mat_inverse_id COMMAND bn_test mat 5 0
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1)
-add_test(NAME bn_mat_inverse_sing_1 COMMAND bn_test mat 5 1
1,2,2,0,1,1,3,4,2,2,1,0,0,0,0,0)
-add_test(NAME bn_mat_inverse_sing_2 COMMAND bn_test mat 5 1
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
-add_test(NAME bn_mat_inverse_1 COMMAND bn_test mat 5 0
14.16,71.27,95.53,77.27,91.51,26.83,17.56,6.94,30.11,40.47,38.1,39.27,56.52,90.12,87.96,84.3
0.00836179,0.0114599,0.0844829,-0.0479631,-0.0600379,-0.0107874,-0.349984,0.218954,0.0425546,0.0207413,-0.0527631,-0.0161344,0.0141745,-0.0177931,0.372557,-0.173216)
+BRLCAD_ADD_TEST(NAME bn_mat_inverse_0 COMMAND bn_test mat 5 1
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+BRLCAD_ADD_TEST(NAME bn_mat_inverse_id COMMAND bn_test mat 5 0
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_inverse_sing_1 COMMAND bn_test mat 5 1
1,2,2,0,1,1,3,4,2,2,1,0,0,0,0,0)
+BRLCAD_ADD_TEST(NAME bn_mat_inverse_sing_2 COMMAND bn_test mat 5 1
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
+BRLCAD_ADD_TEST(NAME bn_mat_inverse_1 COMMAND bn_test mat 5 0
14.16,71.27,95.53,77.27,91.51,26.83,17.56,6.94,30.11,40.47,38.1,39.27,56.52,90.12,87.96,84.3
0.00836179,0.0114599,0.0844829,-0.0479631,-0.0600379,-0.0107874,-0.349984,0.218954,0.0425546,0.0207413,-0.0527631,-0.0161344,0.0141745,-0.0177931,0.372557,-0.173216)
# For function #6 (bn_mat_trn), the <args> format is as follows:
#
@@ -450,10 +450,10 @@
# where M is the matrix to transpose.
# A matrix is 16 floating point numbers separated by commas.
-add_test(NAME bn_mat_trn_id COMMAND bn_test mat 6
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1)
-add_test(NAME bn_mat_trn_same COMMAND bn_test mat 6
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
-add_test(NAME bn_mat_trn_1 COMMAND bn_test mat 6
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 1,5,9,13,2,6,10,14,3,7,11,15,4,8,12,16)
-add_test(NAME bn_mat_trn_2 COMMAND bn_test mat 6
99.01,41.88,17.07,37.47,38.8,42.89,34.48,82.84,59.97,23.74,6.98,27.81,1.64,86.35,43.57,13.87
99.01,38.8,59.97,1.64,41.88,42.89,23.74,86.35,17.07,34.48,6.98,43.57,37.47,82.84,27.81,13.87)
+BRLCAD_ADD_TEST(NAME bn_mat_trn_id COMMAND bn_test mat 6
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_trn_same COMMAND bn_test mat 6
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+BRLCAD_ADD_TEST(NAME bn_mat_trn_1 COMMAND bn_test mat 6
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 1,5,9,13,2,6,10,14,3,7,11,15,4,8,12,16)
+BRLCAD_ADD_TEST(NAME bn_mat_trn_2 COMMAND bn_test mat 6
99.01,41.88,17.07,37.47,38.8,42.89,34.48,82.84,59.97,23.74,6.98,27.81,1.64,86.35,43.57,13.87
99.01,38.8,59.97,1.64,41.88,42.89,23.74,86.35,17.07,34.48,6.98,43.57,37.47,82.84,27.81,13.87)
# For function #7 (bn_mat_is_identity), the <args> format is as follows:
#
@@ -462,10 +462,10 @@
# where M is the matrix to test.
# A matrix is 16 floating point numbers separated by commas.
-add_test(NAME bn_mat_is_identity_id COMMAND bn_test mat 7
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1)
-add_test(NAME bn_mat_is_identity_0 COMMAND bn_test mat 7
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0)
-add_test(NAME bn_mat_is_identity_1 COMMAND bn_test mat 7
15.58,76.15,18.45,80.55,52.36,28.49,85.75,56.75,76.44,66.57,32.39,52.18,39.21,96.09,98.66,30.95
0)
-add_test(NAME bn_mat_is_identity_2 COMMAND bn_test mat 7
1.001,0,0,0,0,1.001,0,0,0,0,1.001,0,0,0,0,1.001 0)
+BRLCAD_ADD_TEST(NAME bn_mat_is_identity_id COMMAND bn_test mat 7
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1)
+BRLCAD_ADD_TEST(NAME bn_mat_is_identity_0 COMMAND bn_test mat 7
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0)
+BRLCAD_ADD_TEST(NAME bn_mat_is_identity_1 COMMAND bn_test mat 7
15.58,76.15,18.45,80.55,52.36,28.49,85.75,56.75,76.44,66.57,32.39,52.18,39.21,96.09,98.66,30.95
0)
+BRLCAD_ADD_TEST(NAME bn_mat_is_identity_2 COMMAND bn_test mat 7
1.001,0,0,0,0,1.001,0,0,0,0,1.001,0,0,0,0,1.001 0)
# For function #8 (bn_mat_det3), the <args> format is as follows:
#
@@ -474,10 +474,10 @@
# where M is the matrix to find the upper-left 3x3 determinant of.
# A matrix is 16 floating point numbers separated by commas.
-add_test(NAME bn_mat_det3_id COMMAND bn_test mat 8
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1)
-add_test(NAME bn_mat_det3_0 COMMAND bn_test mat 8
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0)
-add_test(NAME bn_mat_det3_1 COMMAND bn_test mat 8
77.64,50.22,46.68,16.35,41.25,71.79,24.01,23.88,37.37,94.83,34.25,4.43,95.01,81.8,1.45,45.57
45601.558488)
-add_test(NAME bn_mat_det3_2 COMMAND bn_test mat 8
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 0)
+BRLCAD_ADD_TEST(NAME bn_mat_det3_id COMMAND bn_test mat 8
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1)
+BRLCAD_ADD_TEST(NAME bn_mat_det3_0 COMMAND bn_test mat 8
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0)
+BRLCAD_ADD_TEST(NAME bn_mat_det3_1 COMMAND bn_test mat 8
77.64,50.22,46.68,16.35,41.25,71.79,24.01,23.88,37.37,94.83,34.25,4.43,95.01,81.8,1.45,45.57
45601.558488)
+BRLCAD_ADD_TEST(NAME bn_mat_det3_2 COMMAND bn_test mat 8
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 0)
# For function #9 (bn_mat_determinant), the <args> format is as follows:
#
@@ -486,10 +486,10 @@
# where M is the matrix to find the determinant of.
# A matrix is 16 floating point numbers separated by commas.
-add_test(NAME bn_mat_determinant_id COMMAND bn_test mat 9
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1)
-add_test(NAME bn_mat_determinant_0 COMMAND bn_test mat 9
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0)
-add_test(NAME bn_mat_determinant_1 COMMAND bn_test mat 9
80.22,28.45,95.46,74.05,53.38,74.98,71.55,24.86,65.01,46.42,64.24,49.13,75.74,79.22,64.61,17.33
2.1004520202541295e6)
-add_test(NAME bn_mat_determinant_2 COMMAND bn_test mat 9
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 0)
+BRLCAD_ADD_TEST(NAME bn_mat_determinant_id COMMAND bn_test mat 9
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1 1)
+BRLCAD_ADD_TEST(NAME bn_mat_determinant_0 COMMAND bn_test mat 9
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0)
+BRLCAD_ADD_TEST(NAME bn_mat_determinant_1 COMMAND bn_test mat 9
80.22,28.45,95.46,74.05,53.38,74.98,71.55,24.86,65.01,46.42,64.24,49.13,75.74,79.22,64.61,17.33
2.1004520202541295e6)
+BRLCAD_ADD_TEST(NAME bn_mat_determinant_2 COMMAND bn_test mat 9
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 0)
# For function #10 (bn_mat_is_equal), the <args> format is as follows:
#
@@ -498,10 +498,10 @@
# where M1 and M2 are the two matrices to be compared.
# A matrix is 16 floating point numbers separated by commas.
-add_test(NAME bn_mat_is_equal_1 COMMAND bn_test mat 10
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 1)
-add_test(NAME bn_mat_is_equal_2 COMMAND bn_test mat 10
70.46,38.7,1.57,84.19,38.53,52.52,89.28,8.58,89.96,61.36,5.45,63.62,99.98,82.15,65.44,67.46
70.46,38.7,1.57,84.19,38.53,52.52,89.28,8.58,89.96,61.36,5.45,63.62,99.98,82.15,65.44,67.46
1)
-add_test(NAME bn_mat_is_equal_3 COMMAND bn_test mat 10
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0)
-add_test(NAME bn_mat_is_equal_4 COMMAND bn_test mat 10
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
71.53,18.85,47.48,24.56,42.34,98.18,42.1,74.61,30.47,49.18,63.06,2.11,58.31,60.61,0.62,34.23
0)
+BRLCAD_ADD_TEST(NAME bn_mat_is_equal_1 COMMAND bn_test mat 10
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 1)
+BRLCAD_ADD_TEST(NAME bn_mat_is_equal_2 COMMAND bn_test mat 10
70.46,38.7,1.57,84.19,38.53,52.52,89.28,8.58,89.96,61.36,5.45,63.62,99.98,82.15,65.44,67.46
70.46,38.7,1.57,84.19,38.53,52.52,89.28,8.58,89.96,61.36,5.45,63.62,99.98,82.15,65.44,67.46
1)
+BRLCAD_ADD_TEST(NAME bn_mat_is_equal_3 COMMAND bn_test mat 10
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0)
+BRLCAD_ADD_TEST(NAME bn_mat_is_equal_4 COMMAND bn_test mat 10
1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1
71.53,18.85,47.48,24.56,42.34,98.18,42.1,74.61,30.47,49.18,63.06,2.11,58.31,60.61,0.62,34.23
0)
# For function #11 (bn_mat_atan2), the <args> format is as follows:
#
@@ -509,11 +509,11 @@
#
# where x and y are the floating point arguments to the atan2 function
-add_test(NAME bn_atan2_0_0 COMMAND bn_test mat 11 0 0 0)
-add_test(NAME bn_atan2_0_1 COMMAND bn_test mat 11 2.8 0
1.570796326794896)
-add_test(NAME bn_atan2_0_2 COMMAND bn_test mat 11 -2.8 0
-1.570796326794896)
-add_test(NAME bn_atan2_1 COMMAND bn_test mat 11 2.55 8.76
0.283268001141651)
-add_test(NAME bn_atan2_2 COMMAND bn_test mat 11 -2.8 -7.2
-2.770701364777130)
+BRLCAD_ADD_TEST(NAME bn_atan2_0_0 COMMAND bn_test mat 11 0 0 0)
+BRLCAD_ADD_TEST(NAME bn_atan2_0_1 COMMAND bn_test mat 11 2.8 0
1.570796326794896)
+BRLCAD_ADD_TEST(NAME bn_atan2_0_2 COMMAND bn_test mat 11 -2.8 0
-1.570796326794896)
+BRLCAD_ADD_TEST(NAME bn_atan2_1 COMMAND bn_test mat 11 2.55 8.76
0.283268001141651)
+BRLCAD_ADD_TEST(NAME bn_atan2_2 COMMAND bn_test mat 11 -2.8 -7.2
-2.770701364777130)
# For function #12 (bn_vtoh_move), the <args> format is as follows:
#
@@ -522,7 +522,7 @@
# where V is the 3-vector to move to a homogeneous vector.
# A vector is three floating point numbers separated by commas.
-add_test(NAME bn_vtoh_move COMMAND bn_test mat 12 2.6,-5.5,8.12
2.6,-5.5,8.12,1)
+BRLCAD_ADD_TEST(NAME bn_vtoh_move COMMAND bn_test mat 12
2.6,-5.5,8.12 2.6,-5.5,8.12,1)
# For function #13 (bn_vtoh_move), the <args> format is as follows:
#
@@ -531,7 +531,7 @@
# where H is the homogeneous vector to move to a 3-vector.
# A homogeneous vector is four floating point numbers separated by commas.
-add_test(NAME bn_htov_move COMMAND bn_test mat 13 1.1,2.2,3.3,7.4
0.14864864864864866,0.2972972972972973,0.4459459459459459)
+BRLCAD_ADD_TEST(NAME bn_htov_move COMMAND bn_test mat 13
1.1,2.2,3.3,7.4 0.14864864864864866,0.2972972972972973,0.4459459459459459)
# For function #14 (bn_mat_ae), the <args> format is as follows:
#
@@ -541,7 +541,7 @@
# transform matrix.
# az and el are floating point numbers and are in degrees.
-add_test(NAME bn_mat_ae COMMAND bn_test mat 14 0 90
0,0,-1,0,0,1,0,0,1,0,0,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_ae COMMAND bn_test mat 14 0 90
0,0,-1,0,0,1,0,0,1,0,0,0,0,0,0,1)
# For function #15 (bn_ae_vec), the <args> format is as follows:
#
@@ -552,9 +552,9 @@
# Functions 15-17 were verified using the website below.
# http://www.random-science-tools.com/maths/coordinate-converter.htm
-add_test(NAME bn_ae_vec_0 COMMAND bn_test mat 15 0,1,0 90 0)
-add_test(NAME bn_ae_vec_1 COMMAND bn_test mat 15 5.7,-2.34,19.61
337.68055960702 72.556852698595)
-add_test(NAME bn_ae_vec_2 COMMAND bn_test mat 15 -23.78,42,3.141
119.518125952119 3.7234738236524)
+BRLCAD_ADD_TEST(NAME bn_ae_vec_0 COMMAND bn_test mat 15 0,1,0 90 0)
+BRLCAD_ADD_TEST(NAME bn_ae_vec_1 COMMAND bn_test mat 15
5.7,-2.34,19.61 337.68055960702 72.556852698595)
+BRLCAD_ADD_TEST(NAME bn_ae_vec_2 COMMAND bn_test mat 15
-23.78,42,3.141 119.518125952119 3.7234738236524)
# For function #16 (bn_vec_ae), the <args> format is as follows:
#
@@ -567,8 +567,8 @@
# The value of the returned vector seems to always have the same z value
# irrespective of the input.
-add_test(NAME bn_vec_ae_1 COMMAND bn_test mat 16 1 1
0.291926581820,0.454648713558,0.841470984697)
-add_test(NAME bn_vec_ae_2 COMMAND bn_test mat 16 0.5 1.2
0.317998846662,0.173723561699,0.932039085893)
+BRLCAD_ADD_TEST(NAME bn_vec_ae_1 COMMAND bn_test mat 16 1 1
0.291926581820,0.454648713558,0.841470984697)
+BRLCAD_ADD_TEST(NAME bn_vec_ae_2 COMMAND bn_test mat 16 0.5 1.2
0.317998846662,0.173723561699,0.932039085893)
# For function #17 (bn_vec_aed), the <args> format is as follows:
#
@@ -579,8 +579,8 @@
# az and el are floating point numbers and are in radians.
# d is a floating point number.
-add_test(NAME bn_vec_aed_1 COMMAND bn_test mat 17 1 1 5
1.45963290910,2.27324356779,4.20735492349)
-add_test(NAME bn_vec_aed_2 COMMAND bn_test mat 17 0.3845 0.286
18.3354 16.3062567701,6.59816438267,5.17272752864)
+BRLCAD_ADD_TEST(NAME bn_vec_aed_1 COMMAND bn_test mat 17 1 1 5
1.45963290910,2.27324356779,4.20735492349)
+BRLCAD_ADD_TEST(NAME bn_vec_aed_2 COMMAND bn_test mat 17 0.3845
0.286 18.3354 16.3062567701,6.59816438267,5.17272752864)
# For function #18 (bn_mat_angles), the <args> format is as follows:
#
@@ -592,8 +592,8 @@
# Functions 18 and 19 were verified using the website below
# http://toolserver.org/~dschwen/tools/rotationmatrix.html
-add_test(NAME bn_mat_angles_1 COMMAND bn_test mat 18 30 40 50
0.4924038765,-0.5868240888,0.6427876097,0,0.8700019038,0.310468461,-0.3830222216,0,0.0252013863,0.7478280708,0.6634139482,0,0,0,0,1)
-add_test(NAME bn_mat_angles_2 COMMAND bn_test mat 18 84.23 19.5 38.9
0.733604282,-0.591944033,0.3338068592,0,0.3215992025,-0.1303153824,-0.9378655842,0,0.5986641049,0.7953742282,0.0947688064,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_angles_1 COMMAND bn_test mat 18 30 40 50
0.4924038765,-0.5868240888,0.6427876097,0,0.8700019038,0.310468461,-0.3830222216,0,0.0252013863,0.7478280708,0.6634139482,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_angles_2 COMMAND bn_test mat 18 84.23 19.5
38.9
0.733604282,-0.591944033,0.3338068592,0,0.3215992025,-0.1303153824,-0.9378655842,0,0.5986641049,0.7953742282,0.0947688064,0,0,0,0,1)
# For function #19 (bn_mat_angles_rad), the <args> format is as follows:
#
@@ -602,8 +602,8 @@
# where x, y, z are the angles to rotate about their respective axes
# x, y, z are floating point numbers and are in radians.
-add_test(NAME bn_mat_angles_rad_1 COMMAND bn_test mat 19 1.14 0.856 0.321
0.6219827767,-0.2068090198,0.7552267572,0,0.7829298453,0.1797494268,-0.5955761923,0,-0.0125810482,0.9617277021,0.2737180014,0,0,0,0,1)
-add_test(NAME bn_mat_angles_rad_2 COMMAND bn_test mat 19 0.6 1 0.92
0.3273260276,-0.4298653899,0.8414709848,0,0.9444818397,0.1219905484,-0.3050776304,0,0.0284908076,0.8946139126,0.4459307359,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_angles_rad_1 COMMAND bn_test mat 19 1.14 0.856
0.321
0.6219827767,-0.2068090198,0.7552267572,0,0.7829298453,0.1797494268,-0.5955761923,0,-0.0125810482,0.9617277021,0.2737180014,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_angles_rad_2 COMMAND bn_test mat 19 0.6 1 0.92
0.3273260276,-0.4298653899,0.8414709848,0,0.9444818397,0.1219905484,-0.3050776304,0,0.0284908076,0.8946139126,0.4459307359,0,0,0,0,1)
# For function #20 (bn_eigen2x2), the <args> format is as follows:
#
@@ -614,8 +614,8 @@
# eigenvector will be in vec1.
# An eigen vector is two floating point numbers separated by commas.
-add_test(NAME bn_eigen2x2_1 COMMAND bn_test mat 20 2.18 13.9 6.6
-9.68459058019096 18.464590580191 0.760598630446286,-0.649222398999938,0
0.649222398999938,0.760598630446286,0)
-add_test(NAME bn_eigen2x2_2 COMMAND bn_test mat 20 1 2 3
-0.23606797749979 4.23606797749979 0.85065080835204,-0.525731112119133,0
0.525731112119133,0.85065080835204,0)
+BRLCAD_ADD_TEST(NAME bn_eigen2x2_1 COMMAND bn_test mat 20 2.18 13.9
6.6 -9.68459058019096 18.464590580191 0.760598630446286,-0.649222398999938,0
0.649222398999938,0.760598630446286,0)
+BRLCAD_ADD_TEST(NAME bn_eigen2x2_2 COMMAND bn_test mat 20 1 2 3
-0.23606797749979 4.23606797749979 0.85065080835204,-0.525731112119133,0
0.525731112119133,0.85065080835204,0)
# For function #21 (bn_mat_xrot), the <args> format is as follows:
#
@@ -625,8 +625,8 @@
# about the x-axis.
# sinx and cosx are floating point values.
-add_test(NAME bn_mat_xrot_1 COMMAND bn_test mat 21 0.342020143325668
0.939692620785908
1,0,0,0,0,0.9396926208,-0.3420201433,0,0,0.3420201433,0.9396926208,0,0,0,0,1)
-add_test(NAME bn_mat_xrot_2 COMMAND bn_test mat 21 -0.78260815685241
0.622514636637619
1,0,0,0,0,0.6225146366,0.7826081569,0,0,-0.7826081569,0.6225146366,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_xrot_1 COMMAND bn_test mat 21
0.342020143325668 0.939692620785908
1,0,0,0,0,0.9396926208,-0.3420201433,0,0,0.3420201433,0.9396926208,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_xrot_2 COMMAND bn_test mat 21
-0.78260815685241 0.622514636637619
1,0,0,0,0,0.6225146366,0.7826081569,0,0,-0.7826081569,0.6225146366,0,0,0,0,1)
# For function #22 (bn_mat_yrot), the <args> format is as follows:
#
@@ -636,8 +636,8 @@
# about the y-axis.
# siny and cosy are floating point values.
-add_test(NAME bn_mat_yrot_1 COMMAND bn_test mat 22 0.30901699437494
0.951056516295153
0.9510565163,0,-0.3090169944,0,0,1,0,0,0.3090169944,0,0.9510565163,0,0,0,0,1)
-add_test(NAME bn_mat_yrot_2 COMMAND bn_test mat 22 0.17364817766693
0.984807753012208
0.9848077530122,0,-0.1736481777,0,0,1,0,0,0.1736481777,0,0.984807753,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_yrot_1 COMMAND bn_test mat 22
0.30901699437494 0.951056516295153
0.9510565163,0,-0.3090169944,0,0,1,0,0,0.3090169944,0,0.9510565163,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_yrot_2 COMMAND bn_test mat 22
0.17364817766693 0.984807753012208
0.9848077530122,0,-0.1736481777,0,0,1,0,0,0.1736481777,0,0.984807753,0,0,0,0,1)
# For function #23 (bn_mat_zrot), the <args> format is as follows:
#
@@ -647,8 +647,8 @@
# about the z-axis.
# sinz and cosz are floating point values.
-add_test(NAME bn_mat_zrot_1 COMMAND bn_test mat 23 0.669130606358858
0.743144825477394
0.743144825477394,-0.669130606358858,0,0,0.669130606358858,0.743144825477394,0,0,0,0,1,0,0,0,0,1)
-add_test(NAME bn_mat_zrot_2 COMMAND bn_test mat 23 -0.99619469809174
-0.087155742747658
-0.087155742747658,0.996194698091745,0,0,-0.996194698091746,-0.087155742747658,0,0,0,0,1,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_zrot_1 COMMAND bn_test mat 23
0.669130606358858 0.743144825477394
0.743144825477394,-0.669130606358858,0,0,0.669130606358858,0.743144825477394,0,0,0,0,1,0,0,0,0,1)
+BRLCAD_ADD_TEST(NAME bn_mat_zrot_2 COMMAND bn_test mat 23
-0.99619469809174 -0.087155742747658
-0.087155742747658,0.996194698091745,0,0,-0.996194698091746,-0.087155742747658,0,0,0,0,1,0,0,0,0,1)
# For function #24 (bn_mat_scale_about_pt), the <args> format is as follows:
#
@@ -659,8 +659,8 @@
# A point is three floating point numbers separated by commas.
# Scale is a floating point number.
-add_test(NAME bn_mat_scale_about_pt_1 COMMAND bn_test mat 24 3,4,5 1.5 0
1,0,0,-1,0,1,0,-1.333333333333333,0,0,1,-1.666666666666667,0,0,0,0.666666666666667)
-add_test(NAME bn_mat_scale_about_pt_2 COMMAND bn_test mat 24 2.18,-4.55,-17.4
0.31 0
1,0,0,4.852258064516120,0,1,0,-10.127419354838700,0,0,1,-38.729032258064500,0,0,0,3.225806451612900)
+BRLCAD_ADD_TEST(NAME bn_mat_scale_about_pt_1 COMMAND bn_test mat 24 3,4,5 1.5
0
1,0,0,-1,0,1,0,-1.333333333333333,0,0,1,-1.666666666666667,0,0,0,0.666666666666667)
+BRLCAD_ADD_TEST(NAME bn_mat_scale_about_pt_2 COMMAND bn_test mat 24
2.18,-4.55,-17.4 0.31 0
1,0,0,4.852258064516120,0,1,0,-10.127419354838700,0,0,1,-38.729032258064500,0,0,0,3.225806451612900)
# For function #25 (bn_mat_xform_about_pt), the <args> format is as follows:
#
@@ -670,7 +670,7 @@
# A matrix is 16 floating point values separated by commas.
# A point is three floating point values separated by commas.
-add_test(NAME bn_mat_xform_about_pt_1 COMMAND bn_test mat 25
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 -2,4.5,6.7
-25,-26,-27,219.9,63.5,69,74.5,-602.65,96.1,103.8,111.5,-902.75,13,14,15,-121.5)
+BRLCAD_ADD_TEST(NAME bn_mat_xform_about_pt_1 COMMAND bn_test mat 25
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 -2,4.5,6.7
-25,-26,-27,219.9,63.5,69,74.5,-602.65,96.1,103.8,111.5,-902.75,13,14,15,-121.5)
# For function #26 (bn_mat_ck), the <args> format is as follows:
#
@@ -679,19 +679,19 @@
# where M is the matrix to check for axis perpendicularity
# A matrix is 16 floating point values separated by commas.
-add_test(NAME bn_mat_ck_1 COMMAND bn_test mat 26
-0.064769339233561,-0.740316935054896,-0.669130606358858,0,-0.920939044198179,-0.213876288688268,0.325773249374894,0,-0.384286624235859,0.637328619165857,-0.667934144677115,0,0,0,0,1
0)
-add_test(NAME bn_mat_ck_2 COMMAND bn_test mat 26
-0.384795044679446,-0.906520316365329,0.17364817766693,23.835,-0.772197474581702,0.419235049422787,0.477444272753497,-1.23,-0.505612335529687,0.049627506006009,-0.861332268528144,-46.321,0,0,0,1
0)
-add_test(NAME bn_mat_ck_3 COMMAND bn_test mat 26
-0.38457345,-0.944,0.46483,23.835,0.27474,0.4192787,0.4272753497,-1.23,-0.87,0.06009,0.999144,-46.321,0,0,0,1
-1)
+BRLCAD_ADD_TEST(NAME bn_mat_ck_1 COMMAND bn_test mat 26
-0.064769339233561,-0.740316935054896,-0.669130606358858,0,-0.920939044198179,-0.213876288688268,0.325773249374894,0,-0.384286624235859,0.637328619165857,-0.667934144677115,0,0,0,0,1
0)
+BRLCAD_ADD_TEST(NAME bn_mat_ck_2 COMMAND bn_test mat 26
-0.384795044679446,-0.906520316365329,0.17364817766693,23.835,-0.772197474581702,0.419235049422787,0.477444272753497,-1.23,-0.505612335529687,0.049627506006009,-0.861332268528144,-46.321,0,0,0,1
0)
+BRLCAD_ADD_TEST(NAME bn_mat_ck_3 COMMAND bn_test mat 26
-0.38457345,-0.944,0.46483,23.835,0.27474,0.4192787,0.4272753497,-1.23,-0.87,0.06009,0.999144,-46.321,0,0,0,1
-1)
# For function #27 (bn_mat_dup), there is one argument to keep main()
# happy, which is ignored.
# A matrix is initiated, copied and the dereferenced pointer compared in the
function.
-add_test(NAME bn_mat_dup COMMAND bn_test mat 27 0)
+BRLCAD_ADD_TEST(NAME bn_mat_dup COMMAND bn_test mat 27 0)
# ***************** sobolseq.c tests ***************
-add_test(NAME bn_sobol_3_1000 COMMAND bn_test sobolseq 3 1000)
+BRLCAD_ADD_TEST(NAME bn_sobol_3_1000 COMMAND bn_test sobolseq 3 1000)
#
# *************** tabdata.c tests ***************
@@ -708,7 +708,7 @@
# comma-separated numbers, where the first one is the number of
# entries: nx,x0,x1,...,x(nx).
-add_test(NAME bn_table_make_uniform COMMAND bn_test tabdata 1 0 100 10
10,0,10,20,30,40,50,60,70,80,90,100)
+BRLCAD_ADD_TEST(NAME bn_table_make_uniform COMMAND bn_test tabdata 1 0 100 10
10,0,10,20,30,40,50,60,70,80,90,100)
# For function #2 (bn_tabdata_add), the <args> format is as follows:
#
@@ -722,7 +722,7 @@
# entry is nx,x0,x1,...,x(nx), then the tabdata entry is
# y0,y1,...y(nx-1)
-add_test(NAME bn_tabdata_add COMMAND bn_test tabdata 2 5,0,20,40,60,80,100
1,2,3,4,5 8,3,6,2,9 9,5,9,6,14)
+BRLCAD_ADD_TEST(NAME bn_tabdata_add COMMAND bn_test tabdata 2
5,0,20,40,60,80,100 1,2,3,4,5 8,3,6,2,9 9,5,9,6,14)
# For function #3 (bn_tabdata_mul), the <args> format is as follows:
#
@@ -736,7 +736,7 @@
# table entry is nx,x0,x1,...,x(nx), then the tabdata entry is
# y0,y1,...y(nx-1)
-add_test(NAME bn_tabdata_mul COMMAND bn_test tabdata 3 5,0,20,40,60,80,100
1,2,3,4,5 8,3,6,2,9 8,6,18,8,45)
+BRLCAD_ADD_TEST(NAME bn_tabdata_mul COMMAND bn_test tabdata 3
5,0,20,40,60,80,100 1,2,3,4,5 8,3,6,2,9 8,6,18,8,45)
# For function #4 (bn_tabdata_mul3), the <args> format is as follows:
#
@@ -750,7 +750,7 @@
# it refers; if the table entry is nx,x0,x1,...,x(nx), then the
# tabdata entry is y0,y1,...y(nx-1)
-add_test(NAME bn_tabdata_mul3 COMMAND bn_test tabdata 4 5,0,20,40,60,80,100
1,2,3,4,5 8,3,6,2,9 8,6,18,8,45 64,36,324,64,2025)
+BRLCAD_ADD_TEST(NAME bn_tabdata_mul3 COMMAND bn_test tabdata 4
5,0,20,40,60,80,100 1,2,3,4,5 8,3,6,2,9 8,6,18,8,45 64,36,324,64,2025)
# For function #5 (bn_tabdata_incr_mul3_scale), the <args> format is as
follows:
@@ -766,7 +766,7 @@
# it refers; if the table entry is nx,x0,x1,...,x(nx), then the
# tabdata entry is y0,y1,...y(nx-1)
-add_test(NAME bn_tabdata_incr_mul3_scale COMMAND bn_test tabdata 5
5,0,20,40,60,80,100 5,4,3,2,1 1,2,3,4,5 8,3,6,2,9 8,6,18,8,45 2
133,76,651,130,4051)
+BRLCAD_ADD_TEST(NAME bn_tabdata_incr_mul3_scale COMMAND bn_test tabdata 5
5,0,20,40,60,80,100 5,4,3,2,1 1,2,3,4,5 8,3,6,2,9 8,6,18,8,45 2
133,76,651,130,4051)
# For function #6 (bn_tabdata_incr_mul2_scale), the <args> format is as
follows:
@@ -782,7 +782,7 @@
# entry is nx,x0,x1,...,x(nx), then the tabdata entry is
# y0,y1,...y(nx-1)
-add_test(NAME bn_tabdata_incr_mul2_scale COMMAND bn_test tabdata 6
5,0,20,40,60,80,100 5,4,3,2,1 1,2,3,4,5 8,3,6,2,9 2 21,16,39,18,91)
+BRLCAD_ADD_TEST(NAME bn_tabdata_incr_mul2_scale COMMAND bn_test tabdata 6
5,0,20,40,60,80,100 5,4,3,2,1 1,2,3,4,5 8,3,6,2,9 2 21,16,39,18,91)
# For function #7 (bn_tabdata_scale), the <args> format is as follows:
@@ -796,7 +796,7 @@
# table entry is nx,x0,x1,...,x(nx), then the tabdata entry is
# y0,y1,...y(nx-1)
-add_test(NAME bn_tabdata_scale COMMAND bn_test tabdata 7 5,0,20,40,60,80,100
1,2,3,4,5 2 2,4,6,8,10)
+BRLCAD_ADD_TEST(NAME bn_tabdata_scale COMMAND bn_test tabdata 7
5,0,20,40,60,80,100 1,2,3,4,5 2 2,4,6,8,10)
# For function #8 (bn_table_scale), the <args> format is as follows:
@@ -807,7 +807,7 @@
# comma-separated numbers, where the first one is the number of
# entries: nx,x0,x1,...,x(nx).
-add_test(NAME bn_table_scale COMMAND bn_test tabdata 8 5,0,20,40,60,80,100 2
5,0,40,80,120,160,200)
+BRLCAD_ADD_TEST(NAME bn_table_scale COMMAND bn_test tabdata 8
5,0,20,40,60,80,100 2 5,0,40,80,120,160,200)
# For function #9 (bn_tabdata_join1), the <args> format is as follows:
@@ -822,7 +822,7 @@
# the table to which it refers; if the table entry is
# nx,x0,x1,...,x(nx), then the tabdata entry is y0,y1,...y(nx-1)
-add_test(NAME bn_tabdata_join1 COMMAND bn_test tabdata 9 5,0,20,40,60,80,100
1,2,3,4,5 5,4,3,2,1 2 11,10,9,8,7)
+BRLCAD_ADD_TEST(NAME bn_tabdata_join1 COMMAND bn_test tabdata 9
5,0,20,40,60,80,100 1,2,3,4,5 5,4,3,2,1 2 11,10,9,8,7)
# For function #10 (bn_tabdata_join2), the <args> format is as follows:
@@ -837,7 +837,7 @@
# the table to which it refers; if the table entry is
# nx,x0,x1,...,x(nx), then the tabdata entry is y0,y1,...y(nx-1)
-add_test(NAME bn_tabdata_join2 COMMAND bn_test tabdata 10 5,0,20,40,60,80,100
1,2,3,4,5 5,4,3,2,1 2,4,6,8,10 2 3 17,22,27,32,37)
+BRLCAD_ADD_TEST(NAME bn_tabdata_join2 COMMAND bn_test tabdata 10
5,0,20,40,60,80,100 1,2,3,4,5 5,4,3,2,1 2,4,6,8,10 2 3 17,22,27,32,37)
# For function #11 (bn_tabdata_blend2), the <args> format is as follows:
@@ -852,7 +852,7 @@
# the table to which it refers; if the table entry is
# nx,x0,x1,...,x(nx), then the tabdata entry is y0,y1,...y(nx-1)
@@ Diff output truncated at 100000 characters. @@
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
