Revision: 77771
http://sourceforge.net/p/brlcad/code/77771
Author: starseeker
Date: 2020-11-20 22:31:45 +0000 (Fri, 20 Nov 2020)
Log Message:
-----------
Merge from trunk - r77700 through 77770
Modified Paths:
--------------
brlcad/branches/extbuild/CMakeLists.txt
brlcad/branches/extbuild/NEWS
brlcad/branches/extbuild/TODO
brlcad/branches/extbuild/bench/CMakeLists.txt
brlcad/branches/extbuild/db/CMakeLists.txt
brlcad/branches/extbuild/misc/CMake/BRLCAD_Test_Wrappers.cmake
brlcad/branches/extbuild/misc/repoconv/github_ci_actions.yml
brlcad/branches/extbuild/regress/CMakeLists.txt
brlcad/branches/extbuild/regress/asc/CMakeLists.txt
brlcad/branches/extbuild/regress/bots/CMakeLists.txt
brlcad/branches/extbuild/regress/comgeom/CMakeLists.txt
brlcad/branches/extbuild/regress/dsp/CMakeLists.txt
brlcad/branches/extbuild/regress/fuzz/CMakeLists.txt
brlcad/branches/extbuild/regress/gqa/CMakeLists.txt
brlcad/branches/extbuild/regress/iges/CMakeLists.txt
brlcad/branches/extbuild/regress/lights/CMakeLists.txt
brlcad/branches/extbuild/regress/mged/CMakeLists.txt
brlcad/branches/extbuild/regress/moss/CMakeLists.txt
brlcad/branches/extbuild/regress/nirt/CMakeLists.txt
brlcad/branches/extbuild/regress/red/CMakeLists.txt
brlcad/branches/extbuild/regress/rtedge/CMakeLists.txt
brlcad/branches/extbuild/regress/shaders/CMakeLists.txt
brlcad/branches/extbuild/regress/solids/CMakeLists.txt
brlcad/branches/extbuild/regress/spdi/CMakeLists.txt
brlcad/branches/extbuild/regress/weight/CMakeLists.txt
brlcad/branches/extbuild/src/gtools/tests/CMakeLists.txt
brlcad/branches/extbuild/src/gtools/tests/bigdb.c
brlcad/branches/extbuild/src/libanalyze/tests/CMakeLists.txt
brlcad/branches/extbuild/src/libbg/spsr/Octree.inl
brlcad/branches/extbuild/src/libbg/tests/CMakeLists.txt
brlcad/branches/extbuild/src/libbn/tests/CMakeLists.txt
brlcad/branches/extbuild/src/libbrep/tests/CMakeLists.txt
brlcad/branches/extbuild/src/libbu/tests/CMakeLists.txt
brlcad/branches/extbuild/src/libbu/tests/dylib/CMakeLists.txt
brlcad/branches/extbuild/src/libgcv/tests/CMakeLists.txt
brlcad/branches/extbuild/src/libged/move_all/move_all.c
brlcad/branches/extbuild/src/libged/simulate/tests/CMakeLists.txt
brlcad/branches/extbuild/src/libged/tests/CMakeLists.txt
brlcad/branches/extbuild/src/libnmg/tests/CMakeLists.txt
brlcad/branches/extbuild/src/librt/tests/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/extbuild/db/radialgrid.asc
Property Changed:
----------------
brlcad/branches/extbuild/
brlcad/branches/extbuild/NEWS
brlcad/branches/extbuild/bench/
brlcad/branches/extbuild/db/
brlcad/branches/extbuild/regress/
brlcad/branches/extbuild/src/libbu/
Index: brlcad/branches/extbuild
===================================================================
--- brlcad/branches/extbuild 2020-11-20 21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild 2020-11-20 22:31:45 UTC (rev 77771)
Property changes on: brlcad/branches/extbuild
___________________________________________________________________
Modified: svn:mergeinfo
## -11,4 +11,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:77547-77699
\ No newline at end of property
+/brlcad/trunk:77547-77770
\ No newline at end of property
Modified: brlcad/branches/extbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/CMakeLists.txt 2020-11-20 21:49:02 UTC (rev
77770)
+++ brlcad/branches/extbuild/CMakeLists.txt 2020-11-20 22:31:45 UTC (rev
77771)
@@ -168,9 +168,7 @@
# CMake's default "make test" target is a bit limited - define
# our own "unit" and "check" targets that automate more of the
# dependency updating process.
-if(NOT BRLCAD_IS_SUBBUILD)
- include(BRLCAD_Test_Wrappers)
-endif(NOT BRLCAD_IS_SUBBUILD)
+include(BRLCAD_Test_Wrappers)
#---------------------------------------------------------------------
# Load macros that will be used to define the BRL-CAD
Modified: brlcad/branches/extbuild/NEWS
===================================================================
--- brlcad/branches/extbuild/NEWS 2020-11-20 21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/NEWS 2020-11-20 22:31:45 UTC (rev 77771)
@@ -13,6 +13,7 @@
--- 2020-xx-xx Release 7.32.2 ---
----------------------------------------------------------------------
+* changed 'mvall' to rename all refs even w/ no object - Sean Morrison
* fixed MGED search command crash on empty database - Sean Morrison
* improved performance calculating BoT bounding boxes - Vikram Atreya
* fixed MGED crash closing multiple rt views on Windows - Cliff Yapp
Property changes on: brlcad/branches/extbuild/NEWS
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
/brlcad/branches/osg/NEWS:62110-62113
/brlcad/branches/prep-cache/NEWS:68236-68933
/brlcad/branches/tcltk86/NEWS:68300-75257
-/brlcad/trunk/NEWS:77547-77657,77660-77689
\ No newline at end of property
+/brlcad/trunk/NEWS:77547-77657,77660-77689,77700-77770
\ No newline at end of property
Modified: brlcad/branches/extbuild/TODO
===================================================================
--- brlcad/branches/extbuild/TODO 2020-11-20 21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/TODO 2020-11-20 22:31:45 UTC (rev 77771)
@@ -174,6 +174,52 @@
THESE ARE UNSCHEDULED BACKLOG TASKS
-----------------------------------
+* extract a skin or other exterior surface for a given model. 3 options:
+ 1. Implement a "shrinkwrap" feature that calculates a concave hull
+ 2. Shoot rays from outside, construct exterior mesh based on hits
+ (akin to marching cubes, a surface reconstruction)
+ 3. Shoot rays from outside at exterior vertices, retain all mesh faces
+ and objects encountered (i.e., not reconstructed, but extracted)
+
+* RTAREA
+
+ * add an option to rtarea for onehit. this is probably best as an
+ option that reports the requested objects only and then has a
+ verbose option for the more detailed hiearchical report that is
+ currently produced.
+
+ * verify rtarea. There are reports that the rtarea
+ command may have a bug in its calculations. This needs to be
+ investigated.
+
+ * review and fix rtarea's taxonomy for describing
+ presented/projected areas. users expect presented area to
+ represent what is currently referred to as exposed area. may make
+ more sense to introduce a different terms for other shotline
+ encounters.
+
+ * make rtarea display a cross-hair and perhaps coordinates for the
+ center of area if run from within mged.
+
+=======
+ * add an option to rtarea for onehit. this is probably best as an
+ option that reports the requested objects only and then has a
+ verbose option for the more detailed hiearchical report that is
+ currently produced.
+
+ * verify rtarea. There are reports that the rtarea
+ command may have a bug in its calculations. This needs to be
+ investigated.
+
+ * review and fix rtarea's taxonomy for describing
+ presented/projected areas. users expect presented area to
+ represent what is currently referred to as exposed area. may make
+ more sense to introduce a different terms for other shotline
+ encounters.
+
+ * make rtarea display a cross-hair and perhaps coordinates for the
+ center of area if run from within mged.
+
* bot -V check solid bot.s visualizations don't show up if bot.s is
first drawn in MGED - should properly "overlay" them so the user
doesn't have to first erase the solid from the scene visual.
@@ -191,6 +237,7 @@
* procedural studio box generation allowing for specification of size,
shape, material, and lighting characteristics
+>>>>>>> .r77755
* verify all of the src/util utilities behave correctly on Windows
with respect to mode (i.e. correctly using setmode/O_BINARY when
performing file I/O.)
@@ -864,11 +911,6 @@
file for FIXME note); add tests for both functions (note only
g-dot.c wants to use the functions at the moment)
-* verify/fix/improve rtarea. There are reports that the rtarea
- command may have a bug in its calculations. This needs to be
- investigated along with a review of the taxonomy used by rtarea for
- describing presented/projected areas.
-
* eliminate dbi_filepath (perhaps replace with dbi_filedir) as we
shouldn't need to search. we were told where the database was.
@@ -1033,9 +1075,6 @@
normals. Consider adding an option to smoothly interpolate normals
(per face or vertex).
-* make rtarea display a cross-hair and perhaps coordinates for the
- center of area if run from within mged.
-
* refactor and manage libbn tolerance uses by providing an interface
default (e.g., an init macro) and making everyone use that where it
is hardcoded to 0.0005 presently (and a few places where it's
@@ -2142,8 +2181,12 @@
* implement a ls-dyna "keyword" file format importer. perhaps extract
as nmg/bot boundary representation meshes. lots of great vehicle
datasets at http://www.ncac.gwu.edu/vml/models.html
+ Update - above link seems to be down as of 2020, see:
+ https://www.nhtsa.gov/crash-simulation-vehicle-models
+ https://www.ccsa.gmu.edu/models/
+
STEP
----
Index: brlcad/branches/extbuild/bench
===================================================================
--- brlcad/branches/extbuild/bench 2020-11-20 21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/bench 2020-11-20 22:31:45 UTC (rev 77771)
Property changes on: brlcad/branches/extbuild/bench
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,5 ##
/brlcad/branches/opencl/bench:65867-66137
/brlcad/branches/osg/bench:62110-62113
/brlcad/branches/prep-cache/bench:68236-68933
-/brlcad/branches/tcltk86/bench:68300-75257
\ No newline at end of property
+/brlcad/branches/tcltk86/bench:68300-75257
+/brlcad/trunk/bench:77700-77770
\ No newline at end of property
Modified: brlcad/branches/extbuild/bench/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/bench/CMakeLists.txt 2020-11-20 21:49:02 UTC
(rev 77770)
+++ brlcad/branches/extbuild/bench/CMakeLists.txt 2020-11-20 22:31:45 UTC
(rev 77771)
@@ -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
Index: brlcad/branches/extbuild/db
===================================================================
--- brlcad/branches/extbuild/db 2020-11-20 21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/db 2020-11-20 22:31:45 UTC (rev 77771)
Property changes on: brlcad/branches/extbuild/db
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,5 ##
/brlcad/branches/opencl/db:65867-66137
/brlcad/branches/osg/db:62110-62113
/brlcad/branches/prep-cache/db:68236-68933
-/brlcad/branches/tcltk86/db:68300-75257
\ No newline at end of property
+/brlcad/branches/tcltk86/db:68300-75257
+/brlcad/trunk/db:77700-77770
\ No newline at end of property
Modified: brlcad/branches/extbuild/db/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/db/CMakeLists.txt 2020-11-20 21:49:02 UTC (rev
77770)
+++ brlcad/branches/extbuild/db/CMakeLists.txt 2020-11-20 22:31:45 UTC (rev
77771)
@@ -159,6 +159,7 @@
pic.asc
pinewood.asc
prim.asc
+ radialgrid.asc
rounds.asc
tank_car.asc
terra.asc
Copied: brlcad/branches/extbuild/db/radialgrid.asc (from rev 77770,
brlcad/trunk/db/radialgrid.asc)
===================================================================
--- brlcad/branches/extbuild/db/radialgrid.asc (rev 0)
+++ brlcad/branches/extbuild/db/radialgrid.asc 2020-11-20 22:31:45 UTC (rev
77771)
@@ -0,0 +1,36 @@
+title {Sample geometry with a radial gridlines and a shadow-casting light}
+units m
+put {cylinder.r} comb region yes tree {- {- {- {- {- {l c1.tgc} {l c1i.tgc}}
{l c1c1.arb8}} {l c1c2.arb8}} {l c1c3.tgc}} {l c1c4.tgc}}
+attr set {cylinder.r} {region} {R} {region_id} {1003} {material_id} {1} {los}
{100}
+put {50m_ring.s} tor V {0 0 0} H {6.12323399573676603586882E-17 0 -1} r_a
50000 r_h 100
+put {40m_ring.s} tor V {0 0 0} H {6.12323399573676603586882E-17 0 -1} r_a
40000 r_h 100
+put {30m_ring.s} tor V {0 0 0} H {6.12323399573676603586882E-17 0 -1} r_a
30000 r_h 100
+put {20m_ring.s} tor V {0 0 0} H {6.12323399573676603586882E-17 0 -1} r_a
20000 r_h 100
+put {10m_ring.s} tor V {0 0 0} H {6.12323399573676603586882E-17 0 -1} r_a
10000 r_h 100
+put {c1c2.arb8} arb8 V1 {-1449.999999999999545252649
-99.99999999999998578914528 0} V2 {-1449.999999999999545252649 100 0} V3
{-1449.999999999999545252649 100 1900} V4 {-1449.999999999999545252649
-99.99999999999998578914528 1900} V5 {-449.9999999999999431565811
-99.99999999999998578914528 0} V6 {-449.9999999999999431565811 100 0} V7
{-449.9999999999999431565811 100 1900} V8 {-449.9999999999999431565811
-99.99999999999998578914528 1900}
+put {c1c1.arb8} arb8 V1 {1450 -500 1250} V2 {1450 500 1250} V3 {1450 500
1750} V4 {1450 -500 1750} V5 {450 -500 1250} V6 {450 500 1250} V7 {450 500
1750} V8 {450 -500 1750}
+put {ground.s} arb8 V1 {60000.00000000002182787284 -60000.00000000002182787284
-100} V2 {60000.00000000002182787284 60000.00000000002182787284 -100} V3
{60000.00000000002182787284 60000.00000000002182787284 0} V4
{60000.00000000002182787284 -60000.00000000002182787284 0} V5
{-60000.00000000001455191523 -60000.00000000002182787284 -100} V6
{-60000.00000000001455191523 60000.00000000002182787284 -100} V7
{-60000.00000000001455191523 60000.00000000002182787284 0} V8
{-60000.00000000001455191523 -60000.00000000002182787284 0}
+put {ground.r} comb region yes tree {l ground.s}
+attr set {ground.r} {region} {R} {region_id} {1000} {material_id} {1} {los}
{100} {color} {0/255/0}
+put {c1c4.tgc} tgc V {-6.123233995736766242944808E-14 -500 1000} H {0 -1000
6.123233995736767505122256E-14} A {200 0 0} B {0
1.224646799147353374806706E-14 -200} C {200 0 0} D {0
1.224646799147353374806706E-14 -200}
+put {c1c3.tgc} tgc V {0 500 1500} H {0 1000 6.123233995736764980767359E-14}
A {200 0 0} B {0 1.224646799147353374806706E-14 -200} C {200 0 0} D {0
1.224646799147353374806706E-14 -200}
+put {165deg.s} tgc V {53125.92044589875149540603 -14235.04748063865554286167
0} H {-106251.8408917975175427273 28470.09496127731472370215
6.735557395310443447840915E-12} A {-5.91458985689334876413324E-15
1.584809575715884060677382E-15 -100} B {-25.88190451025210236934981
-96.59258262890682544821175 0} C {-5.91458985689334876413324E-15
1.584809575715884060677382E-15 -100} D {-25.88190451025210236934981
-96.59258262890682544821175 0}
+put {135deg.s} tgc V {38890.87296526011050445959 -38890.8729652601177804172 0}
H {-77781.74593052023556083441 77781.74593052025011274964
6.735557395310443447840915E-12} A {-4.329780281177466281177668E-15
4.329780281177467070038573E-15 -100} B {-70.71067811865475505328504
-70.71067811865474084243033 0} C {-4.329780281177466281177668E-15
4.329780281177467070038573E-15 -100} D {-70.71067811865475505328504
-70.71067811865474084243033 0}
+put {105deg.s} tgc V {14235.04748063864644791465 -53125.92044589875877136365
0} H {-28470.09496127729653380811 106251.8408917975320946425
6.735557395310443447840915E-12} A {-1.58480957571588307460125E-15
5.914589856893349552994145E-15 -100} B {-96.59258262890682544821175
-25.88190451025208460578142 0} C {-1.58480957571588307460125E-15
5.914589856893349552994145E-15 -100} D {-96.59258262890682544821175
-25.88190451025208460578142 0}
+put {150deg.s} tgc V {47631.39720814413158223033 -27499.99999999999636202119
0} H {-95262.79441628826316446066 55000 6.735557395310443447840915E-12} A
{-5.302876193624534820650073E-15 3.061616997868382648155861E-15 -100} B
{-49.99999999999999289457264 -86.60254037844387653422018 0} C
{-5.302876193624534820650073E-15 3.061616997868382648155861E-15 -100} D
{-49.99999999999999289457264 -86.60254037844387653422018 0}
+put {120deg.s} tgc V {27499.99999999998908606358 -47631.39720814413158223033
0} H {-54999.99999999998544808477 95262.79441628826316446066
6.735557395310443447840915E-12} A {-3.061616997868381859294956E-15
5.302876193624534820650073E-15 -100} B {-86.60254037844387653422018
-49.99999999999997868371793 0} C {-3.061616997868381859294956E-15
5.302876193624534820650073E-15 -100} D {-86.60254037844387653422018
-49.99999999999997868371793 0}
+put {light.s} ell V {0 0 1500} A {10 0 0} B {0 10 0} C {0 0 10}
+put {light.r} comb region yes tree {l light.s}
+attr set {light.r} {oshader} {light {f 10 s 32 v 0}} {region} {R} {shader}
{light {f 10.0 s 32 v 0}} {region_id} {1002} {material_id} {1} {los} {100}
{color} {255/255/255}
+put {c1i.tgc} tgc V {0 0 0} H {0 0 1900} A {900 0 0} B {0 900 0} C {900 0
0} D {0 900 0}
+put {75deg.s} tgc V {-14235.04748063864099094644 -53125.92044589875877136365
0} H {28470.09496127728561987169 106251.8408917975320946425
6.735557395310443447840915E-12} A {1.584809575715882482955572E-15
5.914589856893349552994145E-15 -100} B {-96.59258262890682544821175
25.88190451025207394764038 0} C {1.584809575715882482955572E-15
5.914589856893349552994145E-15 -100} D {-96.59258262890682544821175
25.88190451025207394764038 0}
+put {45deg.s} tgc V {-38890.8729652601177804172 -38890.8729652601177804172 0}
H {77781.74593052025011274964 77781.74593052025011274964
6.735557395310443447840915E-12} A {4.329780281177467070038573E-15
4.329780281177467070038573E-15 -100} B {-70.71067811865475505328504
70.71067811865475505328504 0} C {4.329780281177467070038573E-15
4.329780281177467070038573E-15 -100} D {-70.71067811865475505328504
70.71067811865475505328504 0}
+put {15deg.s} tgc V {-53125.92044589875877136365 -14235.04748063864099094644
0} H {106251.8408917975320946425 28470.09496127728561987169
6.735557395310443447840915E-12} A {5.914589856893349552994145E-15
1.584809575715882482955572E-15 -100} B {-25.88190451025207394764038
96.59258262890682544821175 0} C {5.914589856893349552994145E-15
1.584809575715882482955572E-15 -100} D {-25.88190451025207394764038
96.59258262890682544821175 0}
+put {90deg.s} tgc V {-3.367778697655221320023674E-12 -55000 0} H
{6.735557395310443447840915E-12 110000.0000000000145519152
6.735557395310443447840915E-12} A {3.749399456654643800636173E-31
6.123233995736766085172627E-15 -100} B {-100 6.123233995736766085172627E-15 0}
C {3.749399456654643800636173E-31 6.123233995736766085172627E-15 -100} D
{-100 6.123233995736766085172627E-15 0}
+put {60deg.s} tgc V {-27500.00000000000727595761 -47631.39720814412430627272
0} H {55000.00000000002182787284 95262.79441628826316446066
6.735557395310443447840915E-12} A {3.061616997868383437016766E-15
5.302876193624534031789167E-15 -100} B {-86.60254037844386232336547
50.00000000000001421085472 0} C {3.061616997868383437016766E-15
5.302876193624534031789167E-15 -100} D {-86.60254037844386232336547
50.00000000000001421085472 0}
+put {30deg.s} tgc V {-47631.39720814413158223033 -27499.99999999999636202119
0} H {95262.79441628826316446066 55000 6.735557395310443447840915E-12} A
{5.302876193624534820650073E-15 3.061616997868382253725408E-15 -100} B
{-49.99999999999999289457264 86.60254037844387653422018 0} C
{5.302876193624534820650073E-15 3.061616997868382253725408E-15 -100} D
{-49.99999999999999289457264 86.60254037844387653422018 0}
+put {grid.r} comb region yes tree {u {u {u {u {u {l 50m_ring.s} {l
40m_ring.s}} {u {l 30m_ring.s} {l 20m_ring.s}}} {u {u {l 10m_ring.s} {l
0deg.s}} {u {l 15deg.s} {l 30deg.s}}}} {u {u {u {l 45deg.s} {l 60deg.s}} {u {l
75deg.s} {l 90deg.s}}} {u {u {l 105deg.s} {l 120deg.s}} {u {l 135deg.s} {l
150deg.s}}}}} {l 165deg.s}}
+attr set {grid.r} {region} {R} {shader} {plastic} {region_id} {1001}
{material_id} {1} {los} {100} {color} {255/255/255}
+put {c1.tgc} tgc V {0 0 0} H {0 0 2000} A {1000 0 0} B {0 1000 0} C {1000
0 0} D {0 1000 0}
+put {0deg.s} tgc V {-55000 0 0} H {110000.0000000000145519152 0
6.735557395310443447840915E-12} A {6.123233995736766085172627E-15 0 -100} B
{0 100 0} C {6.123233995736766085172627E-15 0 -100} D {0 100 0}
+put {all.g} comb region no tree {u {u {u {- {l ground.r} {l grid.r}} {- {l
grid.r} {l c1.tgc}}} {l cylinder.r}} {l light.r}}
Modified: brlcad/branches/extbuild/misc/CMake/BRLCAD_Test_Wrappers.cmake
===================================================================
--- brlcad/branches/extbuild/misc/CMake/BRLCAD_Test_Wrappers.cmake
2020-11-20 21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/misc/CMake/BRLCAD_Test_Wrappers.cmake
2020-11-20 22:31:45 UTC (rev 77771)
@@ -1,180 +1,248 @@
+# B R L C A D _ T E S T _ W R A P P E R S . C M A K E
+#
+# BRL-CAD
+#
+# Copyright (c) 2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+###
-# "make check" runs all of the tests (unit, benchmark, and regression) that
are expected to work.
+# "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(${NC} GREATER 1)
+ 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)
+ # 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>)
+ set(CONFIG $<CONFIG>)
else(CMAKE_CONFIGURATION_TYPES)
- if ("${CONFIG}" STREQUAL "")
- set(CONFIG "\"\"")
- endif ("${CONFIG}" STREQUAL "")
+ if ("${CONFIG}" STREQUAL "")
+ set(CONFIG "\"\"")
+ endif ("${CONFIG}" STREQUAL "")
endif(CMAKE_CONFIGURATION_TYPES)
-add_custom_target(check
- COMMAND ${CMAKE_COMMAND} -E echo
"\"**********************************************************************\""
- COMMAND ${CMAKE_COMMAND} -E echo "NOTE: The \\\"check\\\" a.k.a.
\\\"BRL-CAD Validation Testing\\\" target runs"
- COMMAND ${CMAKE_COMMAND} -E echo " BRL-CAD\\'s unit, system,
integration, benchmark \\(performance\\), and"
- COMMAND ${CMAKE_COMMAND} -E echo " regression tests. To consider
a build viable for production use,"
- COMMAND ${CMAKE_COMMAND} -E echo " these tests must pass.
Dependencies are compiled automatically."
- COMMAND ${CMAKE_COMMAND} -E echo
"\"**********************************************************************\""
- COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -LE
\"Regression|STAND_ALONE\" -E \"^regress-|NOTE|benchmark|slow-\"
--output-on-failure ${JFLAG}
- COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -R \"benchmark\"
--output-on-failure ${JFLAG}
- COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -L \"Regression\"
--output-on-failure ${JFLAG}
- )
-set_target_properties(check PROPERTIES FOLDER "BRL-CAD Validation Testing")
+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"
+ COMMAND ${CMAKE_COMMAND} -E echo " BRL-CAD\\'s unit, system,
integration, benchmark \\(performance\\), and"
+ COMMAND ${CMAKE_COMMAND} -E echo " regression tests. To consider a
build viable for production use,"
+ COMMAND ${CMAKE_COMMAND} -E echo " these tests must pass.
Dependencies are compiled automatically."
+ COMMAND ${CMAKE_COMMAND} -E echo
"\"**********************************************************************\""
+ COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -LE \"Regression|STAND_ALONE\"
-E \"^regress-|NOTE|benchmark|slow-\" --output-on-failure ${JFLAG}
+ COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -R \"benchmark\"
--output-on-failure ${JFLAG}
+ COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -L \"Regression\"
--output-on-failure ${JFLAG}
+ )
+ set_target_properties(check PROPERTIES FOLDER "BRL-CAD Validation Testing")
+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 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"
+ COMMAND ${CMAKE_COMMAND} -E echo " subset of BRL-CAD\\'s API unit
tests that are expected to work \\(i.e.,"
+ COMMAND ${CMAKE_COMMAND} -E echo " tests not currently under
development\\). All dependencies required"
+ COMMAND ${CMAKE_COMMAND} -E echo " by the tests are compiled
automatically."
+ 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)
-if(CMAKE_CONFIGURATION_TYPES)
- set(CONFIG $<CONFIG>)
-else(CMAKE_CONFIGURATION_TYPES)
- if ("${CONFIG}" STREQUAL "")
- set(CONFIG "\"\"")
- endif ("${CONFIG}" STREQUAL "")
-endif(CMAKE_CONFIGURATION_TYPES)
+# 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(). 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(BRLCAD_ADD_TEST NAME test_name COMMAND test_prog)
-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"
- COMMAND ${CMAKE_COMMAND} -E echo " subset of BRL-CAD\\'s API unit
tests that are expected to work \\(i.e.,"
- COMMAND ${CMAKE_COMMAND} -E echo " tests not currently under
development\\). All dependencies required"
- COMMAND ${CMAKE_COMMAND} -E echo " by the tests are compiled
automatically."
- COMMAND ${CMAKE_COMMAND} -E echo
"\"**********************************************************************\""
- COMMAND ${CMAKE_CTEST_COMMAND} -C ${CONFIG} -LE
\"Regression|NOT_WORKING\" -E \"^regress-|NOTE|benchmark|slow-\" ${JFLAG}
- )
+ # TODO - once we can require CMake 3.18, replace the empty string workaround
+ # below with this cmake_language based version. See
+ # https://gitlab.kitware.com/cmake/cmake/-/issues/21414
-set_target_properties(unit PROPERTIES FOLDER "BRL-CAD Validation Testing")
+ # cmake_parse_arguments(PARSE_ARGV 3 ARG "" "" "")
+ # foreach(_av IN LISTS ARG_UNPARSED_ARGUMENTS)
+ # string(APPEND test_args " [==[${_av}]==]")
+ # endforeach()
+ # cmake_language(EVAL CODE "add_test(NAME ${test_name} COMMAND
${test_args})")
-# 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)
- # 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()
+ # 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()
- # 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)
+ # 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)
- # if there are empty strings, we need to manually recreate their calling
- if ("${cnt}" GREATER 0)
+ # if there are empty strings, we need to manually recreate their calling
+ if ("${cnt}" GREATER 0)
- 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})
+ 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 7)
+ 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 7 8)
+ 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})
- # 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.
+ # ADD_EMPTY_HERE: insert support for additional 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 ("${empty}" EQUAL 4)
+ message(FATAL_ERROR "ERROR: encountered an empty string passed to
add_test(${test_name}) as ARGV${empty} > ARGV11. 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)
+ 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)
+ # 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 ("${test_name}" MATCHES ^regress-)
+ return()
+ endif ()
+ if ("${test_prog}" MATCHES ^regress-)
+ return()
+ endif ()
+ if ("${test_name}" MATCHES ^slow-)
+ return()
+ endif ()
+ if ("${test_name}" STREQUAL "benchmark")
+ return()
+ endif ()
+ if ("${test_name}" MATCHES ^NOTE:)
+ return()
+ endif ()
+ # add program needed for test to unit and check target dependencies
+ add_dependencies(unit ${test_prog})
+ add_dependencies(check ${test_prog})
+endfunction(BRLCAD_ADD_TEST NAME test_name COMMAND test_prog)
+
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Modified: brlcad/branches/extbuild/misc/repoconv/github_ci_actions.yml
===================================================================
--- brlcad/branches/extbuild/misc/repoconv/github_ci_actions.yml
2020-11-20 21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/misc/repoconv/github_ci_actions.yml
2020-11-20 22:31:45 UTC (rev 77771)
@@ -35,10 +35,13 @@
- name: Configure
run: |
cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER="cl.exe" -D
CMAKE_CXX_COMPILER="cl.exe" -D ENABLE_ALL=ON -D CMAKE_BUILD_TYPE=Release
+ #cmake -S . -B build -D CMAKE_C_COMPILER="cl.exe" -D
CMAKE_CXX_COMPILER="cl.exe" -D ENABLE_ALL=ON
powershell Write-VolumeCache C
powershell Write-VolumeCache D
- name: Build
+ #run: cd build && ninja -j1 -v STEPCODE_BLD && cd
src/other/ext/STEPCODE_BLD-prefix/src/STEPCODE_BLD-build && ninja clean &&
ninja -j1 -v
+ #run: cmake --build build --config Release --target STEPCODE_BLD && cd
build/src/other/ext/STEPCODE_BLD-prefix/src/STEPCODE_BLD-build && msbuild
ALL_BUILD.vcxproj -t:clean && msbuild ALL_BUILD.vcxproj -v:diag
run: cmake --build build --config Release --target package
- name: Upload Package
Index: brlcad/branches/extbuild/regress
===================================================================
--- brlcad/branches/extbuild/regress 2020-11-20 21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress 2020-11-20 22:31:45 UTC (rev 77771)
Property changes on: brlcad/branches/extbuild/regress
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,5 ##
/brlcad/branches/opencl/regress:65867-66137
/brlcad/branches/osg/regress:62110-62113
/brlcad/branches/prep-cache/regress:68236-68933
-/brlcad/branches/tcltk86/regress:68300-75257
\ No newline at end of property
+/brlcad/branches/tcltk86/regress:68300-75257
+/brlcad/trunk/regress:77700-77770
\ No newline at end of property
Modified: brlcad/branches/extbuild/regress/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/CMakeLists.txt 2020-11-20 21:49:02 UTC
(rev 77770)
+++ brlcad/branches/extbuild/regress/CMakeLists.txt 2020-11-20 22:31:45 UTC
(rev 77771)
@@ -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/branches/extbuild/regress/asc/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/asc/CMakeLists.txt 2020-11-20 21:49:02 UTC
(rev 77770)
+++ brlcad/branches/extbuild/regress/asc/CMakeLists.txt 2020-11-20 22:31:45 UTC
(rev 77771)
@@ -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/branches/extbuild/regress/bots/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/bots/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress/bots/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/regress/comgeom/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/comgeom/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress/comgeom/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/regress/dsp/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/dsp/CMakeLists.txt 2020-11-20 21:49:02 UTC
(rev 77770)
+++ brlcad/branches/extbuild/regress/dsp/CMakeLists.txt 2020-11-20 22:31:45 UTC
(rev 77771)
@@ -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/branches/extbuild/regress/fuzz/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/fuzz/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress/fuzz/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/regress/gqa/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/gqa/CMakeLists.txt 2020-11-20 21:49:02 UTC
(rev 77770)
+++ brlcad/branches/extbuild/regress/gqa/CMakeLists.txt 2020-11-20 22:31:45 UTC
(rev 77771)
@@ -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/branches/extbuild/regress/iges/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/iges/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress/iges/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/regress/lights/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/lights/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress/lights/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/regress/mged/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/mged/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress/mged/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/regress/moss/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/moss/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress/moss/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/regress/nirt/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/nirt/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress/nirt/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/regress/red/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/red/CMakeLists.txt 2020-11-20 21:49:02 UTC
(rev 77770)
+++ brlcad/branches/extbuild/regress/red/CMakeLists.txt 2020-11-20 22:31:45 UTC
(rev 77771)
@@ -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/branches/extbuild/regress/rtedge/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/rtedge/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress/rtedge/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/regress/shaders/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/shaders/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress/shaders/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/regress/solids/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/solids/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress/solids/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/regress/spdi/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/spdi/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress/spdi/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/regress/weight/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/regress/weight/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/regress/weight/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/src/gtools/tests/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/gtools/tests/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/src/gtools/tests/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -1,9 +1,12 @@
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)
+
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/branches/extbuild/src/gtools/tests/bigdb.c
===================================================================
--- brlcad/branches/extbuild/src/gtools/tests/bigdb.c 2020-11-20 21:49:02 UTC
(rev 77770)
+++ brlcad/branches/extbuild/src/gtools/tests/bigdb.c 2020-11-20 22:31:45 UTC
(rev 77771)
@@ -50,6 +50,7 @@
#include "common.h"
#include <string.h>
+#include <stdlib.h>
#include "bu.h"
#include "raytrace.h"
@@ -91,8 +92,20 @@
BU_ASSERT((uint64_t)sz < (uint64_t)(SIZE_MAX/2));
BU_ASSERT(sz > strlen("123......321")+1);
- title = (char *)bu_malloc(sz * 2, "test allocation");
- bu_free(title, "test allocation");
+ /* intentionally using malloc so we can halt the test if this
+ * system will let us allocate enough memory.
+ *
+ * unfortunately, librt currently re-allocates a title 9 times in
+ * the process of writing it to disk, keeping what appears to be 5
+ * of them in memory at the same time.
+ */
+#define MULTIPLIER 5
+ title = (char *)malloc(sz * MULTIPLIER);
+ if (!title) {
+ bu_log("WARNING: unable to allocate %zu MB\n", (sz * MULTIPLIER) /
(1024 * 1024));
+ bu_exit(123, "Aborting test.\n");
+ }
+ free(title);
title = (char *)bu_malloc(sz, "title");
memset(title, ' ', sz);
Modified: brlcad/branches/extbuild/src/libanalyze/tests/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/libanalyze/tests/CMakeLists.txt
2020-11-20 21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/src/libanalyze/tests/CMakeLists.txt
2020-11-20 22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/src/libbg/spsr/Octree.inl
===================================================================
--- brlcad/branches/extbuild/src/libbg/spsr/Octree.inl 2020-11-20 21:49:02 UTC
(rev 77770)
+++ brlcad/branches/extbuild/src/libbg/spsr/Octree.inl 2020-11-20 22:31:45 UTC
(rev 77771)
@@ -1756,13 +1756,13 @@
const OctNode< NodeData >* const * _node;
const OctNode< NodeData >* __node;
int iS , iE , jS , jE , kS , kE;
-#define _S( i ) ( (i==0) ? 1 : 0 )
-#define _E( i ) ( (i==2) ? 1 : 2 )
+#define Oct_S( i ) ( (i==0) ? 1 : 0 )
+#define Oct_E( i ) ( (i==2) ? 1 : 2 )
switch( c )
{
case 0:
_node = _nodes;
- for( int i=0 ; i<3 ; i++ ){ iE=_E(i) ; for( int j=0 ;
j<3 ; j++ ){ jE=_E(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kE=_E(k) , __node
= *_node;
+ for( int i=0 ; i<3 ; i++ ){ iE=Oct_E(i) ; for( int j=0
; j<3 ; j++ ){ jE=Oct_E(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kE=Oct_E(k)
, __node = *_node;
if( __node && __node->children ) for( int ii=0 ,
iii=2*i ; ii<iE ; ii++ , iii++ ) for( int jj=0 , jjj=2*j ; jj<jE ; jj++ , jjj++
) for( int kk=0 , kkk=2*k ; kk<kE ; kk++ , kkk++ )
neighbors.neighbors[iii][jjj][kkk] =
__node->children + Cube::CornerIndex( ii , jj , kk );
} } }
@@ -1769,7 +1769,7 @@
break;
case 1:
_node = _nodes;
- for( int i=0 ; i<3 ; i++ ){ iS=_S(i) ; for( int j=0 ;
j<3 ; j++ ){ jE=_E(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kE=_E(k) , __node
= *_node;
+ for( int i=0 ; i<3 ; i++ ){ iS=Oct_S(i) ; for( int j=0
; j<3 ; j++ ){ jE=Oct_E(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kE=Oct_E(k)
, __node = *_node;
if( __node && __node->children ) for( int ii=iS ,
iii=2*i+iS-1 ; ii<2 ; ii++ , iii++ ) for( int jj=0 , jjj=2*j ; jj<jE ; jj++ ,
jjj++ ) for( int kk=0 , kkk=2*k ; kk<kE ; kk++ , kkk++ )
neighbors.neighbors[iii][jjj][kkk] =
__node->children + Cube::CornerIndex( ii , jj , kk );
} } }
@@ -1776,7 +1776,7 @@
break;
case 2:
_node = _nodes;
- for( int i=0 ; i<3 ; i++ ){ iE=_E(i) ; for( int j=0 ;
j<3 ; j++ ){ jS=_S(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kE=_E(k) , __node
= *_node;
+ for( int i=0 ; i<3 ; i++ ){ iE=Oct_E(i) ; for( int j=0
; j<3 ; j++ ){ jS=Oct_S(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kE=Oct_E(k)
, __node = *_node;
if( __node && __node->children ) for( int ii=0 ,
iii=2*i ; ii<iE ; ii++ , iii++ ) for( int jj=jS , jjj=2*j+jS-1 ; jj<2 ; jj++ ,
jjj++ ) for( int kk=0 , kkk=2*k ; kk<kE; kk++ , kkk++ )
neighbors.neighbors[iii][jjj][kkk] =
__node->children + Cube::CornerIndex( ii , jj , kk );
} } }
@@ -1783,7 +1783,7 @@
break;
case 3:
_node = _nodes;
- for( int i=0 ; i<3 ; i++ ){ iS=_S(i) ; for( int j=0 ;
j<3 ; j++ ){ jS=_S(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kE=_E(k) , __node
= *_node;
+ for( int i=0 ; i<3 ; i++ ){ iS=Oct_S(i) ; for( int j=0
; j<3 ; j++ ){ jS=Oct_S(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kE=Oct_E(k)
, __node = *_node;
if( __node && __node->children ) for( int ii=iS ,
iii=2*i+iS-1 ; ii<2 ; ii++ , iii++ ) for( int jj=jS , jjj=2*j+jS-1 ; jj<2 ;
jj++ , jjj++ ) for( int kk=0 , kkk=2*k ; kk<kE ; kk++ , kkk++ )
neighbors.neighbors[iii][jjj][kkk] =
__node->children + Cube::CornerIndex( ii , jj , kk );
} } }
@@ -1790,7 +1790,7 @@
break;
case 4:
_node = _nodes;
- for( int i=0 ; i<3 ; i++ ){ iE=_E(i) ; for( int j=0 ;
j<3 ; j++ ){ jE=_E(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kS=_S(k) , __node
= *_node;
+ for( int i=0 ; i<3 ; i++ ){ iE=Oct_E(i) ; for( int j=0
; j<3 ; j++ ){ jE=Oct_E(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kS=Oct_S(k)
, __node = *_node;
if( __node && __node->children ) for( int ii=0 ,
iii=2*i ; ii<iE ; ii++ , iii++ ) for( int jj=0 , jjj=2*j ; jj<jE ; jj++ , jjj++
) for( int kk=kS , kkk=2*k+kS-1 ; kk<2 ; kk++ , kkk++ )
neighbors.neighbors[iii][jjj][kkk] =
__node->children + Cube::CornerIndex( ii , jj , kk );
} } }
@@ -1797,7 +1797,7 @@
break;
case 5:
_node = _nodes;
- for( int i=0 ; i<3 ; i++ ){ iS=_S(i) ; for( int j=0 ;
j<3 ; j++ ){ jE=_E(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kS=_S(k) , __node
= *_node;
+ for( int i=0 ; i<3 ; i++ ){ iS=Oct_S(i) ; for( int j=0
; j<3 ; j++ ){ jE=Oct_E(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kS=Oct_S(k)
, __node = *_node;
if( __node && __node->children ) for( int ii=iS ,
iii=2*i+iS-1 ; ii<2 ; ii++ , iii++ ) for( int jj=0 , jjj=2*j ; jj<jE ; jj++ ,
jjj++ ) for( int kk=kS , kkk=2*k+kS-1 ; kk<2 ; kk++ , kkk++ )
neighbors.neighbors[iii][jjj][kkk] =
__node->children + Cube::CornerIndex( ii , jj , kk );
} } }
@@ -1804,7 +1804,7 @@
break;
case 6:
_node = _nodes;
- for( int i=0 ; i<3 ; i++ ){ iE=_E(i) ; for( int j=0 ;
j<3 ; j++ ){ jS=_S(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kS=_S(k) , __node
= *_node;
+ for( int i=0 ; i<3 ; i++ ){ iE=Oct_E(i) ; for( int j=0
; j<3 ; j++ ){ jS=Oct_S(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kS=Oct_S(k)
, __node = *_node;
if( __node && __node->children ) for( int ii=0 ,
iii=2*i ; ii<iE ; ii++ , iii++ ) for( int jj=jS , jjj=2*j+jS-1 ; jj<2 ; jj++ ,
jjj++ ) for( int kk=kS , kkk=2*k+kS-1 ; kk<2 ; kk++ , kkk++ )
neighbors.neighbors[iii][jjj][kkk] =
__node->children + Cube::CornerIndex( ii , jj , kk );
} } }
@@ -1811,14 +1811,14 @@
break;
case 7:
_node = _nodes;
- for( int i=0 ; i<3 ; i++ ){ iS=_S(i) ; for( int j=0 ;
j<3 ; j++ ){ jS=_S(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kS=_S(k) , __node
= *_node;
+ for( int i=0 ; i<3 ; i++ ){ iS=Oct_S(i) ; for( int j=0
; j<3 ; j++ ){ jS=Oct_S(j) ; for( int k=0 ; k<3 ; k++ , _node++ ){ kS=Oct_S(k)
, __node = *_node;
if( __node && __node->children ) for( int ii=iS ,
iii=2*i+iS-1 ; ii<2 ; ii++ , iii++ ) for( int jj=jS , jjj=2*j+jS-1 ; jj<2 ;
jj++ , jjj++ ) for( int kk=kS , kkk=2*k+kS-1 ; kk<2 ; kk++ , kkk++ )
neighbors.neighbors[iii][jjj][kkk] =
__node->children + Cube::CornerIndex( ii , jj , kk );
} } }
break;
}
-#undef _S
-#undef _E
+#undef Oct_S
+#undef Oct_E
}
}
template< class NodeData >
Modified: brlcad/branches/extbuild/src/libbg/tests/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/libbg/tests/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/src/libbg/tests/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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/branches/extbuild/src/libbn/tests/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/libbn/tests/CMakeLists.txt 2020-11-20
21:49:02 UTC (rev 77770)
+++ brlcad/branches/extbuild/src/libbn/tests/CMakeLists.txt 2020-11-20
22:31:45 UTC (rev 77771)
@@ -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)
@@ 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
