Revision: 76720
http://sourceforge.net/p/brlcad/code/76720
Author: starseeker
Date: 2020-08-12 17:22:03 +0000 (Wed, 12 Aug 2020)
Log Message:
-----------
Be more verbose on failure
Modified Paths:
--------------
brlcad/branches/RELEASE/regress/asc/asc.sh
brlcad/branches/RELEASE/regress/asc/asc2dsp.sh
brlcad/branches/RELEASE/regress/bots/bots.sh
brlcad/branches/RELEASE/regress/burst/regress-burst.cmake.in
brlcad/branches/RELEASE/regress/comgeom/comgeom.sh
brlcad/branches/RELEASE/regress/dsp/dsp.sh
brlcad/branches/RELEASE/regress/flawfinder.sh
brlcad/branches/RELEASE/regress/g-dot.sh
brlcad/branches/RELEASE/regress/g-nff.sh
brlcad/branches/RELEASE/regress/gchecker/regress-gchecker.cmake.in
brlcad/branches/RELEASE/regress/ged/regress-ged_mater.cmake.in
brlcad/branches/RELEASE/regress/gqa/gqa.sh
brlcad/branches/RELEASE/regress/icv/regress-icv_export.cmake.in
brlcad/branches/RELEASE/regress/icv/regress-icv_import.cmake.in
brlcad/branches/RELEASE/regress/iges/iges.sh
brlcad/branches/RELEASE/regress/licenses/regress-licenses.cmake.in
brlcad/branches/RELEASE/regress/lights/lights.sh
brlcad/branches/RELEASE/regress/mged/mged.sh
brlcad/branches/RELEASE/regress/mged/regress-mged.cmake.in
brlcad/branches/RELEASE/regress/moss/moss.sh
brlcad/branches/RELEASE/regress/nirt/nirt.sh
brlcad/branches/RELEASE/regress/nurbs/regress-nurbs-test.cmake.in
brlcad/branches/RELEASE/regress/pkg/regress-pkg.cmake.in
brlcad/branches/RELEASE/regress/red/red.sh
brlcad/branches/RELEASE/regress/rtedge/rtedge.sh
brlcad/branches/RELEASE/regress/rtwizard/regress-rtwiz.cmake.in
brlcad/branches/RELEASE/regress/shaders/shaders.sh
brlcad/branches/RELEASE/regress/solids/solids.sh
brlcad/branches/RELEASE/regress/spdi/spdi.sh
brlcad/branches/RELEASE/regress/usage.sh
brlcad/branches/RELEASE/regress/user/regress-user.cmake.in
brlcad/branches/RELEASE/regress/weight/weight.sh
Modified: brlcad/branches/RELEASE/regress/asc/asc.sh
===================================================================
--- brlcad/branches/RELEASE/regress/asc/asc.sh 2020-08-12 16:59:15 UTC (rev
76719)
+++ brlcad/branches/RELEASE/regress/asc/asc.sh 2020-08-12 17:22:03 UTC (rev
76720)
@@ -102,6 +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
exit $STATUS
fi
@@ -152,6 +153,7 @@
# binary dbupdate should't have significantly altered the file.
#if [ $STATUS -gt 0 ] ; then
# log "-> dbupgrade cycle FAILED, see $LOGFILE"
+# cat $LOGFILE
# exit $STATUS
#fi
@@ -167,6 +169,7 @@
if [ $STATUS -gt 0 ] ; then
log "-> asc.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit $STATUS
else
log "-> asc.sh succeeded"
@@ -183,6 +186,7 @@
# If something went wrong, bail.
if [ $STATUS -gt 0 ] ; then
log "-> g2asc broad object coverage check FAILED, see $LOGFILE"
+ cat $LOGFILE
exit $STATUS
fi
Modified: brlcad/branches/RELEASE/regress/asc/asc2dsp.sh
===================================================================
--- brlcad/branches/RELEASE/regress/asc/asc2dsp.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/asc/asc2dsp.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -105,6 +105,7 @@
if [ $STATUS -gt 0 ] ; then
log "-> asc2dsp.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
else
log "-> asc2dsp.sh succeeded"
fi
Modified: brlcad/branches/RELEASE/regress/bots/bots.sh
===================================================================
--- brlcad/branches/RELEASE/regress/bots/bots.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/bots/bots.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -230,6 +230,7 @@
log "-> BoT check succeeded"
else
log "-> BoT check FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $FAILED
Modified: brlcad/branches/RELEASE/regress/burst/regress-burst.cmake.in
===================================================================
--- brlcad/branches/RELEASE/regress/burst/regress-burst.cmake.in
2020-08-12 16:59:15 UTC (rev 76719)
+++ brlcad/branches/RELEASE/regress/burst/regress-burst.cmake.in
2020-08-12 17:22:03 UTC (rev 76720)
@@ -45,7 +45,8 @@
set(burst_log)
if(NOT EXISTS "${CBDIR}/ktank.burst" OR burst_result)
file(APPEND "${LOGFILE}" "Failure: ${burst_result}\n")
- message(FATAL_ERROR "${BURST} failed to process ktank.b, aborting.\nSee
${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "${BURST} failed to process ktank.b, aborting.\nSee
${LOGFILE} for more details.\n${LOG}")
endif(NOT EXISTS "${CBDIR}/ktank.burst" OR burst_result)
# If we copied the input files, clear them out as well
Modified: brlcad/branches/RELEASE/regress/comgeom/comgeom.sh
===================================================================
--- brlcad/branches/RELEASE/regress/comgeom/comgeom.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/comgeom/comgeom.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -158,6 +158,7 @@
log "-> vdeck/comgeom-g check succeeded"
else
log "-> vdeck/comgeom-g check FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $FAILED
Modified: brlcad/branches/RELEASE/regress/dsp/dsp.sh
===================================================================
--- brlcad/branches/RELEASE/regress/dsp/dsp.sh 2020-08-12 16:59:15 UTC (rev
76719)
+++ brlcad/branches/RELEASE/regress/dsp/dsp.sh 2020-08-12 17:22:03 UTC (rev
76720)
@@ -87,6 +87,7 @@
log "-> dsp.sh succeeded"
else
log "-> dsp.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $FAILED
Modified: brlcad/branches/RELEASE/regress/flawfinder.sh
===================================================================
--- brlcad/branches/RELEASE/regress/flawfinder.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/flawfinder.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -70,6 +70,7 @@
log "-> flawfinder.sh succeeded"
else
log "-> flawfinder.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $NUMBER_WRONG
Modified: brlcad/branches/RELEASE/regress/g-dot.sh
===================================================================
--- brlcad/branches/RELEASE/regress/g-dot.sh 2020-08-12 16:59:15 UTC (rev
76719)
+++ brlcad/branches/RELEASE/regress/g-dot.sh 2020-08-12 17:22:03 UTC (rev
76720)
@@ -78,6 +78,7 @@
log "-> g-dot.sh succeeded"
else
log "-> g-dot.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
Modified: brlcad/branches/RELEASE/regress/g-nff.sh
===================================================================
--- brlcad/branches/RELEASE/regress/g-nff.sh 2020-08-12 16:59:15 UTC (rev
76719)
+++ brlcad/branches/RELEASE/regress/g-nff.sh 2020-08-12 17:22:03 UTC (rev
76720)
@@ -85,6 +85,7 @@
log "-> g-nff.sh succeeded"
else
log "-> g-nff.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
Modified: brlcad/branches/RELEASE/regress/gchecker/regress-gchecker.cmake.in
===================================================================
--- brlcad/branches/RELEASE/regress/gchecker/regress-gchecker.cmake.in
2020-08-12 16:59:15 UTC (rev 76719)
+++ brlcad/branches/RELEASE/regress/gchecker/regress-gchecker.cmake.in
2020-08-12 17:22:03 UTC (rev 76720)
@@ -30,12 +30,14 @@
set(gchecker_log)
if(NOT EXISTS "${CBDIR}/gchecker_test.g.ck/ck.gchecker_test.g.overlaps")
file(APPEND "${LOGFILE}" "\n\nError: return code ${gchecker_result}")
- message(FATAL_ERROR "${GCHECKER} failed to process gchecker_test.g,
aborting.\nSee ${CBDIR}/gchecker.log for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "${GCHECKER} failed to process gchecker_test.g,
aborting.\nSee ${CBDIR}/gchecker.log for more details.\n${LOG}")
endif(NOT EXISTS "${CBDIR}/gchecker_test.g.ck/ck.gchecker_test.g.overlaps")
if(gchecker_result)
file(APPEND "${LOGFILE}" "\n\nError: return code ${gchecker_result}")
- message(FATAL_ERROR "[gchecker] Failure, see ${LOGFILE} for more info.\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[gchecker] Failure, see ${LOGFILE} for more
info.\n${LOG}")
endif(gchecker_result)
# Local Variables:
Modified: brlcad/branches/RELEASE/regress/ged/regress-ged_mater.cmake.in
===================================================================
--- brlcad/branches/RELEASE/regress/ged/regress-ged_mater.cmake.in
2020-08-12 16:59:15 UTC (rev 76719)
+++ brlcad/branches/RELEASE/regress/ged/regress-ged_mater.cmake.in
2020-08-12 17:22:03 UTC (rev 76720)
@@ -19,7 +19,8 @@
string(REPLACE "\\" "" MATER_EXEC "${EXEC}")
if (NOT EXISTS "${MATER_EXEC}")
file(WRITE "${LOGFILE}" "mater test program not found at location
\"${MATER_EXEC}\" - aborting\n")
- message(FATAL_ERROR "Unable to find mater test program, aborting.\nSee
${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find mater test program, aborting.\nSee
${LOGFILE} for more details.\n${LOG}")
endif (NOT EXISTS "${MATER_EXEC}")
# Clean up in case we've run before unsuccessfully
@@ -37,7 +38,8 @@
file(APPEND "${LOGFILE}" "${ged_mater_log}")
set(get_mater_log)
if(ged_mater_result)
- message(FATAL_ERROR "[regress-ged_mater] Failure: ${ged_mater_result}. See
${LOGFILE} for more info.\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[regress-ged_mater] Failure: ${ged_mater_result}. See
${LOGFILE} for more info.\n${LOG}")
endif(ged_mater_result)
execute_process(COMMAND "@CMAKE_COMMAND@" -E remove -f
"${CBDIR}/ged_mater_test.g")
@@ -52,7 +54,8 @@
file(APPEND "${LOGFILE}" "${ged_mater_log}")
set(get_mater_log)
if(ged_mater_result)
- message(FATAL_ERROR "[regress-ged_mater] Failure: ${ged_mater_result}. See
${LOGFILE} for more info.\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[regress-ged_mater] Failure: ${ged_mater_result}. See
${LOGFILE} for more info.\n${LOG}")
endif(ged_mater_result)
# Clean up
Modified: brlcad/branches/RELEASE/regress/gqa/gqa.sh
===================================================================
--- brlcad/branches/RELEASE/regress/gqa/gqa.sh 2020-08-12 16:59:15 UTC (rev
76719)
+++ brlcad/branches/RELEASE/regress/gqa/gqa.sh 2020-08-12 17:22:03 UTC (rev
76720)
@@ -171,6 +171,7 @@
log "-> gqa.sh succeeded"
else
log "-> gqa.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
Modified: brlcad/branches/RELEASE/regress/icv/regress-icv_export.cmake.in
===================================================================
--- brlcad/branches/RELEASE/regress/icv/regress-icv_export.cmake.in
2020-08-12 16:59:15 UTC (rev 76719)
+++ brlcad/branches/RELEASE/regress/icv/regress-icv_export.cmake.in
2020-08-12 17:22:03 UTC (rev 76720)
@@ -14,7 +14,8 @@
string(REPLACE "\\" "" ICV_EXEC "${EXEC}")
if (NOT EXISTS "${ICV_EXEC}")
file(WRITE "${LOGFILE}" "icv not found at location \"${ICV_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find icv, aborting.\nSee ${LOGFILE} for more
details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find icv, aborting.\nSee ${LOGFILE} for more
details.\n${LOG}")
endif (NOT EXISTS "${ICV_EXEC}")
# Apparently CMAKE_EXECUTABLE_SUFFIX is not reliably defined in cmake -P - get
@@ -28,7 +29,8 @@
set(PIXCMP_EXEC "${BDIR}/pixcmp${EXE_SUFFIX}")
if (NOT EXISTS "${PIXCMP_EXEC}")
file(WRITE "${LOGFILE}" "pixcmp not found at location \"${PIXCMP_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.\n${LOG}")
endif (NOT EXISTS "${PIXCMP_EXEC}")
# Clean up in case we've run before unsuccessfully
@@ -52,7 +54,8 @@
set(icv_log)
if(NOT EXISTS "${TGTIMG}")
file(APPEND "${LOGFILE}" "Failure: ${icv_result}")
- message(FATAL_ERROR "Unable to convert ${SRCIMG} to ${TGTIMG} with
${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to convert ${SRCIMG} to ${TGTIMG} with
${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
endif(NOT EXISTS "${TGTIMG}")
@@ -67,7 +70,8 @@
set(icv_log)
if(NOT EXISTS "${CBDIR}/${TGT}-ctrl.pix")
file(APPEND "${LOGFILE}" "Failure: ${icv_result}")
- message(FATAL_ERROR "Unable to convert ${SRCIMG} to ${CBDIR}/${TGT}-ctrl.pix
with ${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to convert ${SRCIMG} to ${CBDIR}/${TGT}-ctrl.pix
with ${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
endif(NOT EXISTS "${CBDIR}/${TGT}-ctrl.pix")
file(APPEND "${LOGFILE}" "Converting ${TGTIMG} to ${CBDIR}/${TGT}-out.pix\n")
@@ -79,7 +83,8 @@
set(icv_log)
if(NOT EXISTS "${CBDIR}/${TGT}-out.pix")
file(APPEND "${LOGFILE}" "Failure: ${icv_result}")
- message(FATAL_ERROR "Unable to convert ${TGTIMG} to ${CBDIR}/${TGT}-out.pix
with ${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to convert ${TGTIMG} to ${CBDIR}/${TGT}-out.pix
with ${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
endif(NOT EXISTS "${CBDIR}/${TGT}-out.pix")
@@ -94,7 +99,8 @@
# Final success/failure check
if(${pixcmp_val} GREATER 0)
file(APPEND "${LOGFILE}" "Failure: ${pixcmp_val}")
- message(FATAL_ERROR "Differences found between ${CBDIR}/${TGT}-ctrl.pix and
${CBDIR}/${TGT}-out.pix with ${PIXCMP}, aborting.\nSee ${LOGFILE} for more
details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Differences found between ${CBDIR}/${TGT}-ctrl.pix and
${CBDIR}/${TGT}-out.pix with ${PIXCMP}, aborting.\nSee ${LOGFILE} for more
details.\n${LOG}")
else(${pixcmp_val} GREATER 0)
foreach(of ${OUTPUT_FILES})
execute_process(COMMAND "@CMAKE_COMMAND@" -E remove -f "${of}")
Modified: brlcad/branches/RELEASE/regress/icv/regress-icv_import.cmake.in
===================================================================
--- brlcad/branches/RELEASE/regress/icv/regress-icv_import.cmake.in
2020-08-12 16:59:15 UTC (rev 76719)
+++ brlcad/branches/RELEASE/regress/icv/regress-icv_import.cmake.in
2020-08-12 17:22:03 UTC (rev 76720)
@@ -13,7 +13,8 @@
string(REPLACE "\\" "" ICV_EXEC "${EXEC}")
if (NOT EXISTS "${ICV_EXEC}")
file(WRITE "${LOGFILE}" "icv not found at location \"${ICV_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find icv, aborting.\nSee ${LOGFILE} for more
details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find icv, aborting.\nSee ${LOGFILE} for more
details.\n${LOG}")
endif (NOT EXISTS "${ICV_EXEC}")
# Apparently CMAKE_EXECUTABLE_SUFFIX is not reliably defined in cmake -P - get
@@ -27,7 +28,8 @@
set(PIXCMP_EXEC "${BDIR}/pixcmp${EXE_SUFFIX}")
if (NOT EXISTS "${PIXCMP_EXEC}")
file(WRITE "${LOGFILE}" "pixcmp not found at location \"${PIXCMP_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.\n${LOG}")
endif (NOT EXISTS "${PIXCMP_EXEC}")
# Clean up in case we've run before unsuccessfully
@@ -43,7 +45,8 @@
set(icv_log)
if(NOT EXISTS "${TGTIMG}")
file(APPEND "${LOGFILE}" "Failure: ${icv_result}")
- message(FATAL_ERROR "Unable to convert ${SRCIMG} to ${TGTIMG} with
${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to convert ${SRCIMG} to ${TGTIMG} with
${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
endif(NOT EXISTS "${TGTIMG}")
# pixcmp the results with the control image to make sure icv got it right
@@ -57,7 +60,8 @@
# Final success/failure check
if(${pixcmp_val} GREATER 0)
file(APPEND "${LOGFILE}" "Failure: ${pixcmp_val}")
- message(FATAL_ERROR "Differences found between ${TGTIMG} and ${CTRLIMG} with
${PIXCMP_EXEC}, aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Differences found between ${TGTIMG} and ${CTRLIMG} with
${PIXCMP_EXEC}, aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
else(${pixcmp_val} GREATER 0)
execute_process(COMMAND "@CMAKE_COMMAND@" -E remove -f ${TGTIMG})
endif(${pixcmp_val} GREATER 0)
Modified: brlcad/branches/RELEASE/regress/iges/iges.sh
===================================================================
--- brlcad/branches/RELEASE/regress/iges/iges.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/iges/iges.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -87,6 +87,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: mged failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -99,6 +100,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -110,6 +112,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -129,6 +132,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: iges-g failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -139,6 +143,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: iges-g failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -149,6 +154,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: iges-g failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -183,6 +189,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -193,6 +200,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -203,6 +211,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -268,6 +277,7 @@
log "-> iges.sh succeeded"
else
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
Modified: brlcad/branches/RELEASE/regress/licenses/regress-licenses.cmake.in
===================================================================
--- brlcad/branches/RELEASE/regress/licenses/regress-licenses.cmake.in
2020-08-12 16:59:15 UTC (rev 76719)
+++ brlcad/branches/RELEASE/regress/licenses/regress-licenses.cmake.in
2020-08-12 17:22:03 UTC (rev 76720)
@@ -12,7 +12,8 @@
if(license_result)
file(APPEND ${LOGFILE} "${license_log}\n")
- message(FATAL_ERROR "[license check] Failure: ${license_result} - see
details in log file: ${LOGFILE}\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[license check] Failure: ${license_result} - see
details in log file: ${LOGFILE}\n${LOG}")
endif(license_result)
# Local Variables:
Modified: brlcad/branches/RELEASE/regress/lights/lights.sh
===================================================================
--- brlcad/branches/RELEASE/regress/lights/lights.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/lights/lights.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -109,6 +109,7 @@
log "-> lights.sh succeeded"
else
log "-> lights.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $NUMBER_WRONG
Modified: brlcad/branches/RELEASE/regress/mged/mged.sh
===================================================================
--- brlcad/branches/RELEASE/regress/mged/mged.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/mged/mged.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -185,6 +185,7 @@
log "-> mged check succeeded"
else
log "-> mged check FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $FAILED
Modified: brlcad/branches/RELEASE/regress/mged/regress-mged.cmake.in
===================================================================
--- brlcad/branches/RELEASE/regress/mged/regress-mged.cmake.in 2020-08-12
16:59:15 UTC (rev 76719)
+++ brlcad/branches/RELEASE/regress/mged/regress-mged.cmake.in 2020-08-12
17:22:03 UTC (rev 76720)
@@ -12,7 +12,8 @@
string(REPLACE "\\" "" MGED_EXEC "${EXEC}")
if (NOT EXISTS "${MGED_EXEC}")
file(WRITE "${LOGFILE}" "mged not found at location \"${MGED_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find mged, aborting.\nSee ${LOGFILE} for more
details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find mged, aborting.\nSee ${LOGFILE} for more
details.\n${LOG}")
endif (NOT EXISTS "${MGED_EXEC}")
# Create the .g file
@@ -25,7 +26,8 @@
file(APPEND "${LOGFILE}" "${mged_log}")
set(mged_log)
if(mged_result)
- message(FATAL_ERROR "[mged ${TNAME}] Failure: ${mged_result}. See ${LOGFILE}
for more info.\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[mged ${TNAME}] Failure: ${mged_result}. See ${LOGFILE}
for more info.\n${LOG}")
endif(mged_result)
# Run the core test
@@ -36,7 +38,8 @@
file(APPEND "${LOGFILE}" "${mged_log}")
set(mged_log)
if(mged_result)
- message(FATAL_ERROR "[mged ${TNAME}] Failure: ${mged_result}. See ${LOGFILE}
for more info.\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[mged ${TNAME}] Failure: ${mged_result}. See ${LOGFILE}
for more info.\n${LOG}")
endif(mged_result)
# Clean up
Modified: brlcad/branches/RELEASE/regress/moss/moss.sh
===================================================================
--- brlcad/branches/RELEASE/regress/moss/moss.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/moss/moss.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -161,6 +161,7 @@
log "-> moss.sh succeeded"
else
log "-> moss.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $NUMBER_WRONG
Modified: brlcad/branches/RELEASE/regress/nirt/nirt.sh
===================================================================
--- brlcad/branches/RELEASE/regress/nirt/nirt.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/nirt/nirt.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -569,6 +569,7 @@
log "-> nirt.sh succeeded"
else
log "-> nirt.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
Modified: brlcad/branches/RELEASE/regress/nurbs/regress-nurbs-test.cmake.in
===================================================================
--- brlcad/branches/RELEASE/regress/nurbs/regress-nurbs-test.cmake.in
2020-08-12 16:59:15 UTC (rev 76719)
+++ brlcad/branches/RELEASE/regress/nurbs/regress-nurbs-test.cmake.in
2020-08-12 17:22:03 UTC (rev 76720)
@@ -12,7 +12,8 @@
string(REPLACE "\\" "" NHIT "${EXEC}")
if (NOT EXISTS "${NHIT}")
file(WRITE "${LOGFILE}" "analyze_nhit not found at location \"${NHIT}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find analyze_nhit, aborting.\nSee ${LOGFILE}
for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find analyze_nhit, aborting.\nSee ${LOGFILE}
for more details.\n${LOG}")
endif (NOT EXISTS "${NHIT}")
# Canonicalize path - if we have an absolute path use it, but if the .g file is
@@ -34,7 +35,8 @@
)
if(nurbs_result)
- message(FATAL_ERROR "[nurbs] Failure, unexpected result running ${NHIT}
@NHIT_OPTS@ @NHIT_GFILE@ @NHIT_ARGS@\n ${nurbs_log}\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[nurbs] Failure, unexpected result running ${NHIT}
@NHIT_OPTS@ @NHIT_GFILE@ @NHIT_ARGS@\n ${nurbs_log}\n${LOG}")
endif(nurbs_result)
# Local Variables:
Modified: brlcad/branches/RELEASE/regress/pkg/regress-pkg.cmake.in
===================================================================
--- brlcad/branches/RELEASE/regress/pkg/regress-pkg.cmake.in 2020-08-12
16:59:15 UTC (rev 76719)
+++ brlcad/branches/RELEASE/regress/pkg/regress-pkg.cmake.in 2020-08-12
17:22:03 UTC (rev 76720)
@@ -11,7 +11,8 @@
string(REPLACE "\\" "" RPKG "${EXEC}")
if (NOT EXISTS "${RPKG}")
file(WRITE "${LOGFILE}" "regress_pkg not found at location \"${RPKG}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find regress_pkg, aborting.\nSee ${LOGFILE}
for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find regress_pkg, aborting.\nSee ${LOGFILE}
for more details.\n${LOG}")
endif (NOT EXISTS "${RPKG}")
execute_process(
Modified: brlcad/branches/RELEASE/regress/red/red.sh
===================================================================
--- brlcad/branches/RELEASE/regress/red/red.sh 2020-08-12 16:59:15 UTC (rev
76719)
+++ brlcad/branches/RELEASE/regress/red/red.sh 2020-08-12 17:22:03 UTC (rev
76720)
@@ -492,6 +492,7 @@
log "-> mged 'red' check succeeded"
else
log "-> mged 'red' check FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
Modified: brlcad/branches/RELEASE/regress/rtedge/rtedge.sh
===================================================================
--- brlcad/branches/RELEASE/regress/rtedge/rtedge.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/rtedge/rtedge.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -238,6 +238,7 @@
log "-> rtcheck check succeeded"
else
log "-> rtcheck check FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $FAILURES
Modified: brlcad/branches/RELEASE/regress/rtwizard/regress-rtwiz.cmake.in
===================================================================
--- brlcad/branches/RELEASE/regress/rtwizard/regress-rtwiz.cmake.in
2020-08-12 16:59:15 UTC (rev 76719)
+++ brlcad/branches/RELEASE/regress/rtwizard/regress-rtwiz.cmake.in
2020-08-12 17:22:03 UTC (rev 76720)
@@ -14,7 +14,8 @@
string(REPLACE "\\" "" RTWIZ "${EXEC}")
if (NOT EXISTS "${RTWIZ}")
file(WRITE "${LOGFILE}" "rtwizard not found at location \"${RTWIZ}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find rtwizard, aborting.\nSee ${LOGFILE} for
more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find rtwizard, aborting.\nSee ${LOGFILE} for
more details.\n${LOG}")
endif (NOT EXISTS "${RTWIZ}")
# Apparently CMAKE_EXECUTABLE_SUFFIX is not reliably defined in cmake -P - get
@@ -28,7 +29,8 @@
set(PIXCMP_EXEC "${BDIR}/pixcmp${EXE_SUFFIX}")
if (NOT EXISTS "${PIXCMP_EXEC}")
file(WRITE "${LOGFILE}" "pixcmp not found at location \"${PIXCMP_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.\n${LOG}")
endif (NOT EXISTS "${PIXCMP_EXEC}")
# Reconstruct the tree root from the EXEC path, and identify the input file
location
@@ -48,7 +50,8 @@
set(rtwiz_log)
if(NOT EXISTS "${TGTIMG}")
file(APPEND "${LOGFILE}" "Failure: ${rtwiz_result}")
- message(FATAL_ERROR "Unable to generate ${TGTIMG} with ${RTWIZ},
aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to generate ${TGTIMG} with ${RTWIZ},
aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
endif(NOT EXISTS "${TGTIMG}")
# pixcmp the results with the control image to make sure rtwiz got it right
@@ -61,7 +64,8 @@
if(pixcmp_result)
file(APPEND "${LOGFILE}" "Failure: ${pixcmp_result}")
- message(FATAL_ERROR "Differences found between ${TGTIMG} and ${CTRLIMG} with
${PIXCMP_EXEC}, aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Differences found between ${TGTIMG} and ${CTRLIMG} with
${PIXCMP_EXEC}, aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
endif(pixcmp_result)
execute_process(COMMAND "@CMAKE_COMMAND@" -E remove -f ${TGTIMG})
Modified: brlcad/branches/RELEASE/regress/shaders/shaders.sh
===================================================================
--- brlcad/branches/RELEASE/regress/shaders/shaders.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/shaders/shaders.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -220,6 +220,7 @@
if [ ! -f shaders.rt ] ; then
log "ERROR: mged failed to create shaders.rt"
log "-> shaders.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -249,6 +250,7 @@
if [ ! -f shaders.rt.pix ] ; then
log "ERROR: shaders raytrace failed to create shaders.rt.pix"
log "-> shaders.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -268,6 +270,7 @@
log "-> shaders.sh succeeded"
else
log "-> shaders.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $NUMBER_WRONG
Modified: brlcad/branches/RELEASE/regress/solids/solids.sh
===================================================================
--- brlcad/branches/RELEASE/regress/solids/solids.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/solids/solids.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -85,6 +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
exit 1
fi
mv solids.simple.rt solids.simple.orig.rt
@@ -98,6 +99,7 @@
./solids.simple.rt >> $LOGFILE 2>&1
if [ ! -f solids.simple.rt.pix ] ; then
log "ERROR: raytrace failed, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
if [ ! -f "$PATH_TO_THIS/solids.simple.ref.pix" ] ; then
@@ -116,6 +118,7 @@
log "-> solids.sh succeeded (test 1 of 2)"
else
log "-> solids.sh FAILED (test 1 of 2), see $LOGFILE"
+ cat $LOGFILE
fi
@@ -129,6 +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
exit 1
fi
@@ -139,6 +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
exit 1
fi
@@ -150,6 +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
exit 1
fi
run mv solids.rt solids.orig.rt
@@ -162,6 +168,7 @@
run ./solids.rt
if [ ! -f solids.rt.pix ] ; then
log "ERROR: solids raytrace failed, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
if [ ! -f "$PATH_TO_THIS/solids.ref.pix" ] ; then
@@ -182,6 +189,7 @@
log "-> solids.sh succeeded (test 2 of 2)"
else
log "-> solids.sh FAILED (test 2 of 2), see $LOGFILE"
+ cat $LOGFILE
fi
exit $NUMBER_WRONG
Modified: brlcad/branches/RELEASE/regress/spdi/spdi.sh
===================================================================
--- brlcad/branches/RELEASE/regress/spdi/spdi.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/spdi/spdi.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -133,6 +133,7 @@
log "-> spdi.sh succeeded"
else
log "-> spdi.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $NUMBER_WRONG
Modified: brlcad/branches/RELEASE/regress/usage.sh
===================================================================
--- brlcad/branches/RELEASE/regress/usage.sh 2020-08-12 16:59:15 UTC (rev
76719)
+++ brlcad/branches/RELEASE/regress/usage.sh 2020-08-12 17:22:03 UTC (rev
76720)
@@ -209,6 +209,7 @@
log "-> usage check succeeded"
else
log "-> usage check FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit 0
Modified: brlcad/branches/RELEASE/regress/user/regress-user.cmake.in
===================================================================
--- brlcad/branches/RELEASE/regress/user/regress-user.cmake.in 2020-08-12
16:59:15 UTC (rev 76719)
+++ brlcad/branches/RELEASE/regress/user/regress-user.cmake.in 2020-08-12
17:22:03 UTC (rev 76720)
@@ -11,7 +11,8 @@
string(REPLACE "\\" "" USER_EXEC "${EXEC}")
if (NOT EXISTS "${USER_EXEC}")
file(WRITE "${LOGFILE}" "cad_user not found at location \"${USER_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find cad_user, aborting.\nSee ${LOGFILE} for
more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find cad_user, aborting.\nSee ${LOGFILE} for
more details.\n${LOG}")
endif (NOT EXISTS "${USER_EXEC}")
# Reconstruct the tree root from the EXEC path, and identify the input file
location
@@ -28,7 +29,8 @@
file(APPEND "${LOGFILE}" "${user_log}")
if(user_result)
file(APPEND "${LOGFILE}" "Failure: ${user_result}")
- message(FATAL_ERROR "3rd party user simulation run failed, aborting.\nSee
${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "3rd party user simulation run failed, aborting.\nSee
${LOGFILE} for more details.\n${LOG}")
endif(user_result)
# Local Variables:
Modified: brlcad/branches/RELEASE/regress/weight/weight.sh
===================================================================
--- brlcad/branches/RELEASE/regress/weight/weight.sh 2020-08-12 16:59:15 UTC
(rev 76719)
+++ brlcad/branches/RELEASE/regress/weight/weight.sh 2020-08-12 17:22:03 UTC
(rev 76720)
@@ -260,6 +260,7 @@
log "-> weight.sh succeeded (2 of 2)"
else
log "-> weight.sh FAILED (2 of 2), see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
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
