Revision: 76747
http://sourceforge.net/p/brlcad/code/76747
Author: starseeker
Date: 2020-08-14 12:40:14 +0000 (Fri, 14 Aug 2020)
Log Message:
-----------
Merge changes from RELEASE branch - r76726 through r76746
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
brlcad/trunk/regress/CMakeLists.txt
brlcad/trunk/regress/asc/CMakeLists.txt
brlcad/trunk/regress/asc/asc.sh
brlcad/trunk/regress/asc/asc2dsp.sh
brlcad/trunk/regress/bots/bots.sh
brlcad/trunk/regress/comgeom/comgeom.sh
brlcad/trunk/regress/dsp/dsp.sh
brlcad/trunk/regress/flawfinder.sh
brlcad/trunk/regress/g-dot.sh
brlcad/trunk/regress/g-nff.sh
brlcad/trunk/regress/gqa/gqa.sh
brlcad/trunk/regress/iges/iges.sh
brlcad/trunk/regress/lights/lights.sh
brlcad/trunk/regress/mged/CMakeLists.txt
brlcad/trunk/regress/mged/mged.sh
brlcad/trunk/regress/moss/moss.sh
brlcad/trunk/regress/nirt/nirt.sh
brlcad/trunk/regress/red/red.sh
brlcad/trunk/regress/rtedge/rtedge.sh
brlcad/trunk/regress/shaders/shaders.sh
brlcad/trunk/regress/solids/solids.sh
brlcad/trunk/regress/usage.sh
brlcad/trunk/regress/weight/CMakeLists.txt
brlcad/trunk/regress/weight/weight.sh
brlcad/trunk/src/gtools/gdiff/gdiff.c
brlcad/trunk/src/libged/exec.cpp
brlcad/trunk/src/libged/ged_init.cpp
brlcad/trunk/src/util/cv.c
Added Paths:
-----------
brlcad/trunk/regress/gdiff/
brlcad/trunk/regress/weight/weight.ref
brlcad/trunk/regress/weight/weight.test2.ref
Property Changed:
----------------
brlcad/trunk/
brlcad/trunk/regress/
Index: brlcad/trunk
===================================================================
--- brlcad/trunk 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk 2020-08-14 12:40:14 UTC (rev 76747)
Property changes on: brlcad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75685,76001-76451,76693-76725
+/brlcad/branches/RELEASE:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75685,76001-76451,76693-76746
/brlcad/branches/bioh:75720-75736,75740-75742,75860-75891,75894-75986,76088-76153,76354-76506,76577
/brlcad/branches/brep-debug:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/bullet:62518
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-08-14 12:11:13 UTC
(rev 76746)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-08-14 12:40:14 UTC
(rev 76747)
@@ -949,9 +949,15 @@
# Every regression test gets a build target
if (CMAKE_CONFIGURATION_TYPES)
- add_custom_target(${testname} COMMAND ${CMAKE_CTEST_COMMAND} -C
${CMAKE_CFG_INTDIR} -R ^${testname} --output-on-failure)
+ add_custom_target(${testname}
+ COMMAND ${CMAKE_CTEST_COMMAND} -C ${CMAKE_CFG_INTDIR} -R^${testname}$
--output-on-failure
+ VERBATIM
+ )
else (CMAKE_CONFIGURATION_TYPES)
- add_custom_target(${testname} COMMAND ${CMAKE_CTEST_COMMAND} -R
^${testname} --output-on-failure)
+ add_custom_target(${testname}
+ COMMAND ${CMAKE_CTEST_COMMAND} -R ^${testname}$ --output-on-failure
+ VERBATIM
+ )
endif (CMAKE_CONFIGURATION_TYPES)
if (depends_list)
add_dependencies(${testname} ${depends_list})
Index: brlcad/trunk/regress
===================================================================
--- brlcad/trunk/regress 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress 2020-08-14 12:40:14 UTC (rev 76747)
Property changes on: brlcad/trunk/regress
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/regress:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75372-75681,76704-76725
+/brlcad/branches/RELEASE/regress:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75372-75681,76704-76746
/brlcad/branches/bioh/regress:75860-75891,75894-75986,76088-76153,76354-76506
/brlcad/branches/brep-debug/regress:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927
/brlcad/branches/bullet/regress:62518
Modified: brlcad/trunk/regress/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/CMakeLists.txt 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/CMakeLists.txt 2020-08-14 12:40:14 UTC (rev 76747)
@@ -34,6 +34,9 @@
# Fuzz tests (if supported by the compiler)
add_subdirectory(fuzz)
+# Geometry difference reporting
+add_subdirectory(gdiff)
+
# Image Conversion Regression Tests
add_subdirectory(icv)
Modified: brlcad/trunk/regress/asc/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/asc/CMakeLists.txt 2020-08-14 12:11:13 UTC (rev
76746)
+++ brlcad/trunk/regress/asc/CMakeLists.txt 2020-08-14 12:40:14 UTC (rev
76747)
@@ -7,8 +7,8 @@
endif (TARGET asc2g)
- 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)
+ #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)
@@ -40,7 +40,10 @@
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
"${asc_outfiles}")
DISTCLEAN(${asc_outfiles})
-CMAKEFILES(CMakeLists.txt)
+CMAKEFILES(
+ CMakeLists.txt
+ asc2dsp.sh
+ )
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/regress/asc/asc.sh
===================================================================
--- brlcad/trunk/regress/asc/asc.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/asc/asc.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -102,7 +102,7 @@
# If that didn't work, don't bother going further - we've got a problem.
if [ $STATUS -gt 0 ] ; then
log "-> basic v5 asc.sh round-trip FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit $STATUS
fi
@@ -153,7 +153,7 @@
# binary dbupdate should't have significantly altered the file.
#if [ $STATUS -gt 0 ] ; then
# log "-> dbupgrade cycle FAILED, see $LOGFILE"
-# cat $LOGFILE
+# cat "$LOGFILE"
# exit $STATUS
#fi
@@ -169,7 +169,7 @@
if [ $STATUS -gt 0 ] ; then
log "-> asc.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit $STATUS
else
log "-> asc.sh succeeded"
@@ -186,7 +186,7 @@
# If something went wrong, bail.
if [ $STATUS -gt 0 ] ; then
log "-> g2asc broad object coverage check FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit $STATUS
fi
Modified: brlcad/trunk/regress/asc/asc2dsp.sh
===================================================================
--- brlcad/trunk/regress/asc/asc2dsp.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/asc/asc2dsp.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -105,7 +105,7 @@
if [ $STATUS -gt 0 ] ; then
log "-> asc2dsp.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
else
log "-> asc2dsp.sh succeeded"
fi
Modified: brlcad/trunk/regress/bots/bots.sh
===================================================================
--- brlcad/trunk/regress/bots/bots.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/bots/bots.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -230,7 +230,7 @@
log "-> BoT check succeeded"
else
log "-> BoT check FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $FAILED
Modified: brlcad/trunk/regress/comgeom/comgeom.sh
===================================================================
--- brlcad/trunk/regress/comgeom/comgeom.sh 2020-08-14 12:11:13 UTC (rev
76746)
+++ brlcad/trunk/regress/comgeom/comgeom.sh 2020-08-14 12:40:14 UTC (rev
76747)
@@ -158,7 +158,7 @@
log "-> vdeck/comgeom-g check succeeded"
else
log "-> vdeck/comgeom-g check FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $FAILED
Modified: brlcad/trunk/regress/dsp/dsp.sh
===================================================================
--- brlcad/trunk/regress/dsp/dsp.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/dsp/dsp.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -87,7 +87,7 @@
log "-> dsp.sh succeeded"
else
log "-> dsp.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $FAILED
Modified: brlcad/trunk/regress/flawfinder.sh
===================================================================
--- brlcad/trunk/regress/flawfinder.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/flawfinder.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -70,7 +70,7 @@
log "-> flawfinder.sh succeeded"
else
log "-> flawfinder.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $NUMBER_WRONG
Modified: brlcad/trunk/regress/g-dot.sh
===================================================================
--- brlcad/trunk/regress/g-dot.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/g-dot.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -78,7 +78,7 @@
log "-> g-dot.sh succeeded"
else
log "-> g-dot.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $STATUS
Modified: brlcad/trunk/regress/g-nff.sh
===================================================================
--- brlcad/trunk/regress/g-nff.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/g-nff.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -85,7 +85,7 @@
log "-> g-nff.sh succeeded"
else
log "-> g-nff.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $STATUS
Modified: brlcad/trunk/regress/gqa/gqa.sh
===================================================================
--- brlcad/trunk/regress/gqa/gqa.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/gqa/gqa.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -171,7 +171,7 @@
log "-> gqa.sh succeeded"
else
log "-> gqa.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $STATUS
Modified: brlcad/trunk/regress/iges/iges.sh
===================================================================
--- brlcad/trunk/regress/iges/iges.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/iges/iges.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -87,7 +87,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: mged failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
@@ -100,7 +100,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
@@ -112,7 +112,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
@@ -132,7 +132,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: iges-g failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
@@ -143,7 +143,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: iges-g failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
@@ -154,7 +154,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: iges-g failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
@@ -189,7 +189,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
@@ -200,7 +200,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
@@ -211,7 +211,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
@@ -277,7 +277,7 @@
log "-> iges.sh succeeded"
else
log "-> iges.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $STATUS
Modified: brlcad/trunk/regress/lights/lights.sh
===================================================================
--- brlcad/trunk/regress/lights/lights.sh 2020-08-14 12:11:13 UTC (rev
76746)
+++ brlcad/trunk/regress/lights/lights.sh 2020-08-14 12:40:14 UTC (rev
76747)
@@ -109,7 +109,7 @@
log "-> lights.sh succeeded"
else
log "-> lights.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $NUMBER_WRONG
Modified: brlcad/trunk/regress/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/mged/CMakeLists.txt 2020-08-14 12:11:13 UTC (rev
76746)
+++ brlcad/trunk/regress/mged/CMakeLists.txt 2020-08-14 12:40:14 UTC (rev
76747)
@@ -92,7 +92,7 @@
set(TARGET_NAME ${tname})
set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/regress-mged_${TNAME}.log")
- BRLCAD_REGRESSION_TEST(regress-mged_${tname} "mged" TEST_SCRIPT
"${TSCRIPT}" EXEC mged)
+ BRLCAD_REGRESSION_TEST(regress-mged_${tname} "mged;rtarea;rt;rtcheck"
TEST_SCRIPT "${TSCRIPT}" EXEC mged)
DISTCLEAN("${LOG_FILE}")
endforeach(testfile ${MGED_TESTS})
@@ -99,7 +99,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_REGRESSION_TEST(regress-mged mged TEST_DEFINED)
+ BRLCAD_REGRESSION_TEST(regress-mged "mged;rtarea;rt;rtcheck" TEST_DEFINED)
endif (SH_EXEC)
endif (TARGET mged)
Modified: brlcad/trunk/regress/mged/mged.sh
===================================================================
--- brlcad/trunk/regress/mged/mged.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/mged/mged.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -117,7 +117,7 @@
quit
EOF
if test ! -f mged.g ; then
- cat $LOGFILE
+ cat "$LOGFILE"
log "ERROR: Test file 'mged.g' is missing. Unable to run mged, aborting"
exit 1
fi
@@ -185,7 +185,7 @@
log "-> mged check succeeded"
else
log "-> mged check FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $FAILED
Modified: brlcad/trunk/regress/moss/moss.sh
===================================================================
--- brlcad/trunk/regress/moss/moss.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/moss/moss.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -161,7 +161,7 @@
log "-> moss.sh succeeded"
else
log "-> moss.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $NUMBER_WRONG
Modified: brlcad/trunk/regress/nirt/nirt.sh
===================================================================
--- brlcad/trunk/regress/nirt/nirt.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/nirt/nirt.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -569,7 +569,7 @@
log "-> nirt.sh succeeded"
else
log "-> nirt.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $STATUS
Modified: brlcad/trunk/regress/red/red.sh
===================================================================
--- brlcad/trunk/regress/red/red.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/red/red.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -492,7 +492,7 @@
log "-> mged 'red' check succeeded"
else
log "-> mged 'red' check FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $STATUS
Modified: brlcad/trunk/regress/rtedge/rtedge.sh
===================================================================
--- brlcad/trunk/regress/rtedge/rtedge.sh 2020-08-14 12:11:13 UTC (rev
76746)
+++ brlcad/trunk/regress/rtedge/rtedge.sh 2020-08-14 12:40:14 UTC (rev
76747)
@@ -238,7 +238,7 @@
log "-> rtcheck check succeeded"
else
log "-> rtcheck check FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $FAILURES
Modified: brlcad/trunk/regress/shaders/shaders.sh
===================================================================
--- brlcad/trunk/regress/shaders/shaders.sh 2020-08-14 12:11:13 UTC (rev
76746)
+++ brlcad/trunk/regress/shaders/shaders.sh 2020-08-14 12:40:14 UTC (rev
76747)
@@ -222,7 +222,7 @@
log "ERROR: mged failed to create shaders.rt"
log "-> shaders.sh FAILED, see $LOGFILE"
rm -f $EAGLECAD
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
Modified: brlcad/trunk/regress/solids/solids.sh
===================================================================
--- brlcad/trunk/regress/solids/solids.sh 2020-08-14 12:11:13 UTC (rev
76746)
+++ brlcad/trunk/regress/solids/solids.sh 2020-08-14 12:40:14 UTC (rev
76747)
@@ -85,7 +85,7 @@
if [ ! -f solids.simple.rt ] ; then
log "ERROR: mged failed to create solids.simple.rt script"
log "-> solids.sh FAILED (test 1 of 2), see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
mv solids.simple.rt solids.simple.orig.rt
@@ -99,7 +99,7 @@
./solids.simple.rt >> $LOGFILE 2>&1
if [ ! -f solids.simple.rt.pix ] ; then
log "ERROR: raytrace failed, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
if [ ! -f "$PATH_TO_THIS/solids.simple.ref.pix" ] ; then
@@ -118,7 +118,7 @@
log "-> solids.sh succeeded (test 1 of 2)"
else
log "-> solids.sh FAILED (test 1 of 2), see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
@@ -132,7 +132,7 @@
if [ ! -f solids.ebm.bw ] ; then
log "ERROR: Failed to create file 'solids.ebm.bw'"
log "-> solids.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
@@ -143,7 +143,7 @@
if [ ! -f solids.dsp.pix ] ; then
log "ERROR: Failed to generate file 'solids.dsp.pix'"
log "-> solids.sh FAILED (test 2 of 2), see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
@@ -155,7 +155,7 @@
if [ ! -f solids.rt ] ; then
log "ERROR: mged failed to create solids.rt script"
log "-> solids.sh FAILED (test 2 of 2), see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
run mv solids.rt solids.orig.rt
@@ -168,7 +168,7 @@
run ./solids.rt
if [ ! -f solids.rt.pix ] ; then
log "ERROR: solids raytrace failed, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
exit 1
fi
if [ ! -f "$PATH_TO_THIS/solids.ref.pix" ] ; then
@@ -189,7 +189,7 @@
log "-> solids.sh succeeded (test 2 of 2)"
else
log "-> solids.sh FAILED (test 2 of 2), see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $NUMBER_WRONG
Modified: brlcad/trunk/regress/usage.sh
===================================================================
--- brlcad/trunk/regress/usage.sh 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/regress/usage.sh 2020-08-14 12:40:14 UTC (rev 76747)
@@ -209,7 +209,7 @@
log "-> usage check succeeded"
else
log "-> usage check FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit 0
Modified: brlcad/trunk/regress/weight/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/weight/CMakeLists.txt 2020-08-14 12:11:13 UTC (rev
76746)
+++ brlcad/trunk/regress/weight/CMakeLists.txt 2020-08-14 12:40:14 UTC (rev
76747)
@@ -8,6 +8,8 @@
CMAKEFILES(
weight.sh
+ weight.ref
+ weight.test2.ref
)
# list of temporary files
@@ -19,13 +21,11 @@
weight.mged
weight.out
weight.out_ns
- weight.ref
weight.ref_ns
weight.test2.g
weight.test2.mged
weight.test2.out
weight.test2.out_ns
- weight.test2.ref
weight.test2.ref_ns
)
Copied: brlcad/trunk/regress/weight/weight.ref (from rev 76746,
brlcad/branches/RELEASE/regress/weight/weight.ref)
===================================================================
(Binary files differ)
Modified: brlcad/trunk/regress/weight/weight.sh
===================================================================
--- brlcad/trunk/regress/weight/weight.sh 2020-08-14 12:11:13 UTC (rev
76746)
+++ brlcad/trunk/regress/weight/weight.sh 2020-08-14 12:40:14 UTC (rev
76747)
@@ -82,47 +82,9 @@
rm -f weight.out
run $RTWEIGHT -a 25 -e 35 -s128 -o weight.out weight.g box.r
-rm -f weight.ref
-cat >> weight.ref <<EOF
-RT Weight Program Output:
-
-Database Title: "Untitled BRL-CAD Database"
-Time Stamp: Day Mon 0 00:00:00 0000
-
-
-Density Table Used:/path/to/.density
-
-Material Density(g/cm^3) Name
- 1 7.8295 steel
- Weight by region name (in grams, density given in g/cm^3):
-
- Weight Matl LOS Material Name Density Name
--------- ------ --- --------------- ------- -------------
- 7.829 1 100 steel 7.8295 /box.r
- Weight by region ID (in grams):
-
- ID Weight Region Names
------ -------- --------------------
- 1000 7.829 /box.r
- RT Weight Program Output:
-
-Database Title: "Untitled BRL-CAD Database"
-Time Stamp: Day Mon 0 00:00:00 0000
-
-
-Total volume = 0.999991 cm^3
-
-Centroid: X = 0.5 cm
- Y = 0.5 cm
- Z = 0.5 cm
-
-Total mass = 7.82943 grams
-
-EOF
-
# eliminate the time stamp lines which are obviously different and
# the file path which is not germane to the test
-tr -d ' \t' < weight.ref | grep -v DensityTableUsed | grep -v TimeStamp >
weight.ref_ns
+tr -d ' \t' < "$PATH_TO_THIS/weight.ref" | grep -v DensityTableUsed | grep -v
TimeStamp > weight.ref_ns
tr -d ' \t' < weight.out | grep -v DensityTableUsed | grep -v TimeStamp >
weight.out_ns
run cmp weight.ref_ns weight.out_ns
@@ -192,61 +154,10 @@
run $RTWEIGHT -a 25 -e 35 -s128 -o weight.test2.out weight.test2.g boxes
-rm -f weight.test2.ref
-cat >> weight.test2.ref <<EOF
-RT Weight Program Output:
-
-Database Title: "Untitled BRL-CAD Database"
-Time Stamp: Sat Jan 14 09:01:50 2012
-
-
-Density Table Used:/path/to/.density
-
-Material Density(g/cm^3) Name
- 2 7.8200 Carbon Tool Steel
- 3 2.7000 Aluminum, 6061-T6
- 4 2.7400 Aluminum, 7079-T6
- 6 19.3200 Gold, pure
- 7 8.0300 Stainless, 18Cr-8Ni
- 8 7.4700 Stainless 27Cr
- 9 7.7150 Steel, tool
- 10 7.8400 Carbon Steel
- 12 3.0000 Gunner
- 14 10.0000 Fuel
- Weight by region name (in grams, density given in g/cm^3):
-
- Weight Matl LOS Material Name Density Name
--------- ------ --- --------------- ------- -------------
- 7.822 2 100 Carbon Tool Ste 7.8200 /boxes/box1.r
- 8.021 7 100 Stainless, 18Cr 8.0300 /boxes/box2.r
- 3.001 12 100 Gunner 3.0000 /boxes/box3.r
- Weight by region ID (in grams):
-
- ID Weight Region Names
------ -------- --------------------
- 1000 15.843 /boxes/box1.r
- /boxes/box2.r
- 1010 3.001 /boxes/box3.r
- RT Weight Program Output:
-
-Database Title: "Untitled BRL-CAD Database"
-Time Stamp: Sat Jan 14 09:01:50 2012
-
-
-Total volume = 2.99933 cm^3
-
-Centroid: X = 1.98812 cm
- Y = 1.98833 cm
- Z = 1.98831 cm
-
-Total mass = 18.8433 grams
-
-EOF
-
# eliminate the time stamp lines which are obviously different and
# the file path which is not germane to the test
-tr -d ' \t' < weight.test2.ref | grep -v DensityTableUsed | grep -v TimeStamp
> weight.test2.ref_ns
-tr -d ' \t' < weight.test2.out | grep -v DensityTableUsed | grep -v TimeStamp
> weight.test2.out_ns
+tr -d ' \t\r' < "$PATH_TO_THIS/weight.test2.ref" | grep -v DensityTableUsed |
grep -v TimeStamp > weight.test2.ref_ns
+tr -d ' \t\r' < weight.test2.out | grep -v DensityTableUsed | grep -v
TimeStamp > weight.test2.out_ns
run cmp weight.test2.ref_ns weight.test2.out_ns
STATUS=$?
@@ -260,7 +171,7 @@
log "-> weight.sh succeeded (2 of 2)"
else
log "-> weight.sh FAILED (2 of 2), see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $STATUS
Copied: brlcad/trunk/regress/weight/weight.test2.ref (from rev 76746,
brlcad/branches/RELEASE/regress/weight/weight.test2.ref)
===================================================================
(Binary files differ)
Modified: brlcad/trunk/src/gtools/gdiff/gdiff.c
===================================================================
--- brlcad/trunk/src/gtools/gdiff/gdiff.c 2020-08-14 12:11:13 UTC (rev
76746)
+++ brlcad/trunk/src/gtools/gdiff/gdiff.c 2020-08-14 12:40:14 UTC (rev
76747)
@@ -317,6 +317,10 @@
state->verbosity = state->verbosity - state->quiet;
+ if (state->verbosity > 4) {
+ state->verbosity = 4;
+ }
+
state->return_conflicts = 1;
if (state->return_added == -1 && state->return_removed == -1 &&
state->return_changed == -1 && state->return_unchanged == 0) {
@@ -327,23 +331,23 @@
if (argc != 2 && argc != 3) {
bu_log("Error - please specify either two or three .g files\n");
- bu_exit(EXIT_FAILURE, NULL);
+ bu_exit(-1, NULL);
}
if (!bu_file_exists(argv[0], NULL)) {
- bu_exit(1, "Cannot stat file %s\n", argv[0]);
+ bu_exit(-1, "Cannot stat file %s\n", argv[0]);
}
if (!bu_file_exists(argv[1], NULL)) {
- bu_exit(1, "Cannot stat file %s\n", argv[1]);
+ bu_exit(-1, "Cannot stat file %s\n", argv[1]);
}
if (argc == 3 && !bu_file_exists(argv[2], NULL)) {
- bu_exit(1, "Cannot stat file %s\n", argv[2]);
+ bu_exit(-1, "Cannot stat file %s\n", argv[2]);
}
if (state->merge && bu_file_exists(bu_vls_addr(state->merge_file), NULL)) {
- bu_exit(1, "File %s already exists.\n", bu_vls_addr(state->merge_file));
+ bu_exit(-1, "File %s already exists.\n",
bu_vls_addr(state->merge_file));
}
/* diff case */
@@ -350,11 +354,11 @@
if (argc == 2) {
if (bu_file_same(argv[0], argv[1])) {
- bu_exit(1, "Same database file specified as both left and right
diff inputs: %s\n", argv[0]);
+ bu_exit(-1, "Same database file specified as both left and right
diff inputs: %s\n", argv[0]);
}
if ((left_dbip = db_open(argv[0], DB_OPEN_READONLY)) == DBI_NULL) {
- bu_exit(1, "Cannot open geometry database file %s\n", argv[0]);
+ bu_exit(-1, "Cannot open geometry database file %s\n", argv[0]);
}
RT_CK_DBI(left_dbip);
/* Reset the material head so we don't get warnings when the global
@@ -363,12 +367,12 @@
rt_new_material_head(MATER_NULL);
if (db_dirbuild(left_dbip) < 0) {
db_close(left_dbip);
- bu_exit(1, "db_dirbuild failed on geometry database file %s\n",
argv[0]);
+ bu_exit(-1, "db_dirbuild failed on geometry database file %s\n",
argv[0]);
}
db_update_nref(left_dbip, &rt_uniresource);
if ((right_dbip = db_open(argv[1], DB_OPEN_READONLY)) == DBI_NULL) {
- bu_exit(1, "Cannot open geometry database file %s\n", argv[1]);
+ bu_exit(-1, "Cannot open geometry database file %s\n", argv[1]);
}
RT_CK_DBI(right_dbip);
/* Reset the material head so we don't get warnings when the global
@@ -378,7 +382,7 @@
if (db_dirbuild(right_dbip) < 0) {
db_close(ancestor_dbip);
db_close(right_dbip);
- bu_exit(1, "db_dirbuild failed on geometry database file %s\n",
argv[1]);
+ bu_exit(-1, "db_dirbuild failed on geometry database file %s\n",
argv[1]);
}
db_update_nref(right_dbip, &rt_uniresource);
@@ -389,27 +393,27 @@
if (argc == 3) {
if (bu_file_same(argv[0], argv[1]) && bu_file_same(argv[2], argv[1])) {
- bu_exit(1, "Same database file specified for all three inputs:
%s\n", argv[0]);
+ bu_exit(-1, "Same database file specified for all three inputs:
%s\n", argv[0]);
}
if (bu_file_same(argv[0], argv[1])) {
- bu_exit(1, "Same database file specified as both ancestor and left
diff inputs: %s\n", argv[0]);
+ bu_exit(-1, "Same database file specified as both ancestor and left
diff inputs: %s\n", argv[0]);
}
if (bu_file_same(argv[1], argv[2])) {
- bu_exit(1, "Same database file specified as both ancestor and right
diff inputs: %s\n", argv[1]);
+ bu_exit(-1, "Same database file specified as both ancestor and
right diff inputs: %s\n", argv[1]);
}
if (bu_file_same(argv[0], argv[2])) {
- bu_exit(1, "Same database file specified as both left and right
diff inputs: %s\n", argv[0]);
+ bu_exit(-1, "Same database file specified as both left and right
diff inputs: %s\n", argv[0]);
}
if (!bu_file_exists(argv[2], NULL)) {
- bu_exit(1, "Cannot stat file %s\n", argv[2]);
+ bu_exit(-1, "Cannot stat file %s\n", argv[2]);
}
if ((left_dbip = db_open(argv[0], DB_OPEN_READONLY)) == DBI_NULL) {
- bu_exit(1, "Cannot open geometry database file %s\n", argv[0]);
+ bu_exit(-1, "Cannot open geometry database file %s\n", argv[0]);
}
RT_CK_DBI(left_dbip);
/* Reset the material head so we don't get warnings when the global
@@ -418,12 +422,12 @@
rt_new_material_head(MATER_NULL);
if (db_dirbuild(left_dbip) < 0) {
db_close(left_dbip);
- bu_exit(1, "db_dirbuild failed on geometry database file %s\n",
argv[0]);
+ bu_exit(-1, "db_dirbuild failed on geometry database file %s\n",
argv[0]);
}
db_update_nref(left_dbip, &rt_uniresource);
if ((ancestor_dbip = db_open(argv[1], DB_OPEN_READONLY)) == DBI_NULL) {
- bu_exit(1, "Cannot open geometry database file %s\n", argv[1]);
+ bu_exit(-1, "Cannot open geometry database file %s\n", argv[1]);
}
RT_CK_DBI(ancestor_dbip);
/* Reset the material head so we don't get warnings when the global
@@ -433,12 +437,12 @@
if (db_dirbuild(ancestor_dbip) < 0) {
db_close(left_dbip);
db_close(ancestor_dbip);
- bu_exit(1, "db_dirbuild failed on geometry database file %s\n",
argv[1]);
+ bu_exit(-1, "db_dirbuild failed on geometry database file %s\n",
argv[1]);
}
db_update_nref(ancestor_dbip, &rt_uniresource);
if ((right_dbip = db_open(argv[2], DB_OPEN_READONLY)) == DBI_NULL) {
- bu_exit(1, "Cannot open geometry database file %s\n", argv[2]);
+ bu_exit(-1, "Cannot open geometry database file %s\n", argv[2]);
}
RT_CK_DBI(right_dbip);
/* Reset the material head so we don't get warnings when the global
@@ -448,7 +452,7 @@
if (db_dirbuild(right_dbip) < 0) {
db_close(ancestor_dbip);
db_close(left_dbip);
- bu_exit(1, "db_dirbuild failed on geometry database file %s\n",
argv[2]);
+ bu_exit(-1, "db_dirbuild failed on geometry database file %s\n",
argv[2]);
}
db_update_nref(right_dbip, &rt_uniresource);
Modified: brlcad/trunk/src/libged/exec.cpp
===================================================================
--- brlcad/trunk/src/libged/exec.cpp 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/src/libged/exec.cpp 2020-08-14 12:40:14 UTC (rev 76747)
@@ -32,6 +32,8 @@
#include "ged.h"
#include "./include/plugin.h"
+extern "C" void libged_init(void);
+
extern "C" int
ged_exec(struct ged *gedp, int argc, const char *argv[]) {
if (!gedp || !argc || !argv) {
@@ -52,6 +54,17 @@
// libged's command set so we have a clean fallback available if we ever
// need it to fall back on/recover with.
std::map<std::string, const struct ged_cmd *> *cmap =
(std::map<std::string, const struct ged_cmd *> *)ged_cmds;
+
+ // On OpenBSD, if the executable was launched in a way that requires
+ // bu_setprogname to find the BRL-CAD root directory the iniital libged
+ // initialization would have failed. If we have no ged_cmds at all this is
+ // probably what happened, so call libged_init again here. By the time we
+ // are calling ged_exec bu_setprogname should be set and we should be ready
+ // to actually find the commands.
+ if (!cmap->size()) {
+ libged_init();
+ }
+
std::string key(argv[0]);
std::map<std::string, const struct ged_cmd *>::iterator c_it =
cmap->find(key);
if (c_it == cmap->end()) {
Modified: brlcad/trunk/src/libged/ged_init.cpp
===================================================================
--- brlcad/trunk/src/libged/ged_init.cpp 2020-08-14 12:11:13 UTC (rev
76746)
+++ brlcad/trunk/src/libged/ged_init.cpp 2020-08-14 12:40:14 UTC (rev
76747)
@@ -48,6 +48,8 @@
static char **cmd_list = NULL;
void *ged_cmds;
+extern "C" void libged_init(void);
+
static std::set<void *> ged_handles;
struct bu_vls *ged_init_msg_str;
@@ -67,6 +69,17 @@
return 1;
}
int cmd_invalid = 1;
+
+ // On OpenBSD, if the executable was launched in a way that requires
+ // bu_setprogname to find the BRL-CAD root directory the iniital libged
+ // initialization would have failed. If we have no ged_cmds at all this is
+ // probably what happened, so call libged_init again here. By the time we
+ // are calling ged_cmd_valid bu_setprogname should be set and we should be
+ // ready to actually find the commands.
+ if (!ged_cmd_map.size()) {
+ libged_init();
+ }
+
std::string scmd(cmd);
std::map<std::string, const struct ged_cmd *>::iterator cmd_it =
ged_cmd_map.find(scmd);
if (cmd_it != ged_cmd_map.end()) {
@@ -107,7 +120,7 @@
return cmd_list_len;
}
-static void
+extern "C" void
libged_init(void)
{
Modified: brlcad/trunk/src/util/cv.c
===================================================================
--- brlcad/trunk/src/util/cv.c 2020-08-14 12:11:13 UTC (rev 76746)
+++ brlcad/trunk/src/util/cv.c 2020-08-14 12:40:14 UTC (rev 76747)
@@ -97,8 +97,8 @@
}
} else {
outfp = stdout;
+ setmode(outfp, O_BINARY);
}
- setmode(outfp, O_BINARY);
if (argc >= 4) {
if ((infp = fopen(argv[3], "rb")) == NULL) {
@@ -107,8 +107,8 @@
}
} else {
infp = stdin;
+ setmode(infp, O_BINARY);
}
- setmode(infp, O_BINARY);
if (isatty(fileno(outfp))) {
fprintf(stderr, "cv: trying to send binary output to terminal\n");
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
