Revision: 76731
http://sourceforge.net/p/brlcad/code/76731
Author: starseeker
Date: 2020-08-13 14:10:48 +0000 (Thu, 13 Aug 2020)
Log Message:
-----------
See if we can make more use of run
Modified Paths:
--------------
brlcad/branches/RELEASE/regress/asc/asc.sh
brlcad/branches/RELEASE/regress/bots/bots.sh
brlcad/branches/RELEASE/regress/iges/iges.sh
brlcad/branches/RELEASE/regress/lights/lights.sh
brlcad/branches/RELEASE/regress/shaders/shaders.sh
brlcad/branches/RELEASE/regress/solids/solids.sh
brlcad/branches/RELEASE/regress/spdi/spdi.sh
Modified: brlcad/branches/RELEASE/regress/asc/asc.sh
===================================================================
--- brlcad/branches/RELEASE/regress/asc/asc.sh 2020-08-13 14:01:28 UTC (rev
76730)
+++ brlcad/branches/RELEASE/regress/asc/asc.sh 2020-08-13 14:10:48 UTC (rev
76731)
@@ -77,21 +77,19 @@
ASC1="$1/db/moss.asc"
G1="moss_v5.g"
rm -f $G1
-$A2G "$ASC1" $G1 2>&1 > $LOGFILE
+run $A2G "$ASC1" $G1 2>&1 > $LOGFILE
# Next convert v5 .g file to a v5 asc file
log "convert v5 .g file to v5 asc format"
ASC2="moss_v5.asc"
rm -f $ASC2
-log "$G2A $G1 $ASC2"
-$G2A $G1 $ASC2 2>&1 > $LOGFILE
+run $G2A $G1 $ASC2 2>&1 > $LOGFILE
# convert v5 .g file to a v5 .g file
log "convert v5 asc file to v5 .g format (simple round trip)"
GRT="moss_v5_basic.g"
rm -f $GRT
-log "$A2G $ASC2 $GRT"
-$A2G "$ASC2" $GRT 2>&1 > $LOGFILE
+run $A2G "$ASC2" $GRT 2>&1 > $LOGFILE
# the original v5 .g file and the round-tripped v5 .g file
# should be identical (apparently except for the color table)
@@ -116,15 +114,13 @@
log "convert v5 .g file to v4 .g format"
G2="moss_v4.g"
rm -f $G2
-log "$DU -r $G1 $G2"
-$DU -r $G1 $G2 2>&1 > $LOGFILE
+run $DU -r $G1 $G2 2>&1 > $LOGFILE
# convert v4 .g file to a v4 asc file
log "convert v4 .g file to v4 asc format"
ASC3="moss_v4.asc"
rm -f $ASC3
-log "$G2A $G2 $ASC3"
-$G2A $G2 $ASC3 2>&1 > $LOGFILE
+run $G2A $G2 $ASC3 2>&1 > $LOGFILE
# convert v4 asc to v5 .g file
@@ -131,8 +127,7 @@
log "convert v4 asc file to v5 g format"
G3="moss_v4_asc_v5.g"
rm -f $G3
-log "$A2G $ASC3 $G3"
-$A2G $ASC3 $G3 2>&1 > $LOGFILE
+run $A2G $ASC3 $G3 2>&1 > $LOGFILE
# Next, do the downgrade/upgrade cycle on the .g file to test dbupgrade's
# behavior on a binary v4 .g.
@@ -139,10 +134,8 @@
G4="moss_v4_asc_v4.g"
G5="moss_v4_asc_v4_v5.g"
rm -f $G4 $G5
-log "$DU -r $G3 $G4"
-$DU -r $G3 $G4 2>&1 > $LOGFILE
-log "$DU $G4 $G5"
-$DU $G4 $G5 2>&1 > $LOGFILE
+run $DU -r $G3 $G4 2>&1 > $LOGFILE
+run $DU $G4 $G5 2>&1 > $LOGFILE
# Rather surprisingly, all.g doesn't pass this comparison... not sure
# why yet...
@@ -163,8 +156,7 @@
# (Well, unchanged sans a region color table, region_id=-1 on all.g and
# numerical differences anyway... Accomidate data changes with gdiff
# filtering.)
-log "$GD -v -t 0.0001 -F \"! -name _GLOBAL ! -attr region_id=-1\" $G1 $G5"
-$GD -v -t 0.0001 -F "! -name _GLOBAL ! -attr region_id=-1" $G1 $G5 2>&1 >
$LOGFILE
+run $GD -v -t 0.0001 -F "! -name _GLOBAL ! -attr region_id=-1" $G1 $G5 2>&1 >
$LOGFILE
STATUS=$?
if [ $STATUS -gt 0 ] ; then
@@ -180,8 +172,7 @@
# trip.
#
G2ASC1="$1/regress/asc/v4.g"
-log "$G2A $G2ASC1 v4.asc"
-$G2A "$G2ASC1" v4.asc 2>&1 > $LOGFILE
+run $G2A "$G2ASC1" v4.asc 2>&1 > $LOGFILE
STATUS=$?
# If something went wrong, bail.
if [ $STATUS -gt 0 ] ; then
Modified: brlcad/branches/RELEASE/regress/bots/bots.sh
===================================================================
--- brlcad/branches/RELEASE/regress/bots/bots.sh 2020-08-13 14:01:28 UTC
(rev 76730)
+++ brlcad/branches/RELEASE/regress/bots/bots.sh 2020-08-13 14:10:48 UTC
(rev 76731)
@@ -160,7 +160,7 @@
fi
# compare
rm -f bots.diff.pix
-$PIXDIFF bots.sph.pix bots.rh.pix > bots.diff.pix 2>> bots.diff.log
+run $PIXDIFF bots.sph.pix bots.rh.pix > bots.diff.pix 2>> bots.diff.log
NUMBER_WRONG=`tail -n 1 bots.diff.log | tr , '\012' | awk '/many/ {print $1}'`
if [ $NUMBER_WRONG -eq 0 ] ; then
# we expect implicit and BoT sphere to be different
Modified: brlcad/branches/RELEASE/regress/iges/iges.sh
===================================================================
--- brlcad/branches/RELEASE/regress/iges/iges.sh 2020-08-13 14:01:28 UTC
(rev 76730)
+++ brlcad/branches/RELEASE/regress/iges/iges.sh 2020-08-13 14:10:48 UTC
(rev 76731)
@@ -107,8 +107,7 @@
# test G -> IGES via stdout (can't use 'run')
output="iges.export.stdout.iges"
rm -f "$output"
-log "... running $GIGES iges.g box.nmg > $output"
-$GIGES iges.g box.nmg > $output 2>> "$LOGFILE"
+run $GIGES iges.g box.nmg > $output 2>> "$LOGFILE"
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
@@ -256,7 +255,7 @@
# make our starting database
$GZIP -d -c "$PATH_TO_THIS/m35.asc.gz" > iges.m35.asc
-$ASC2G iges.m35.asc iges.m35.g
+run $ASC2G iges.m35.asc iges.m35.g
# and test it (note it should work with the '-f' option, but fail
# without any options)
Modified: brlcad/branches/RELEASE/regress/lights/lights.sh
===================================================================
--- brlcad/branches/RELEASE/regress/lights/lights.sh 2020-08-13 14:01:28 UTC
(rev 76730)
+++ brlcad/branches/RELEASE/regress/lights/lights.sh 2020-08-13 14:10:48 UTC
(rev 76731)
@@ -100,7 +100,7 @@
log "... running $PIXDIFF lights.pix $PATH_TO_THIS/lights.ref.pix >
lights.diff.pix"
rm -f lights.diff.pix
-$PIXDIFF lights.pix "$PATH_TO_THIS/lights.ref.pix" > lights.diff.pix 2>>
$LOGFILE
+run $PIXDIFF lights.pix "$PATH_TO_THIS/lights.ref.pix" > lights.diff.pix 2>>
$LOGFILE
NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'`
log "lights.pix $NUMBER_WRONG off by many"
Modified: brlcad/branches/RELEASE/regress/shaders/shaders.sh
===================================================================
--- brlcad/branches/RELEASE/regress/shaders/shaders.sh 2020-08-13 14:01:28 UTC
(rev 76730)
+++ brlcad/branches/RELEASE/regress/shaders/shaders.sh 2020-08-13 14:10:48 UTC
(rev 76731)
@@ -73,9 +73,8 @@
fi
-log "... running $GENCOLOR -r205 0 16 32 64 128 | dd of=shaders.ebm.bw bs=1024
count=1"
rm -f shaders.ebm.bw
-$GENCOLOR -r205 0 16 32 64 128 | dd of=shaders.ebm.bw bs=1024 count=1 2>>
$LOGFILE
+run $GENCOLOR -r205 0 16 32 64 128 | dd of=shaders.ebm.bw bs=1024 count=1 2>>
$LOGFILE
EAGLECAD=shaders.eagleCAD-working.pix
Modified: brlcad/branches/RELEASE/regress/solids/solids.sh
===================================================================
--- brlcad/branches/RELEASE/regress/solids/solids.sh 2020-08-13 14:01:28 UTC
(rev 76730)
+++ brlcad/branches/RELEASE/regress/solids/solids.sh 2020-08-13 14:10:48 UTC
(rev 76731)
@@ -108,7 +108,7 @@
fi
rm -f solids.simple.pix.diff
-$PIXDIFF solids.simple.rt.pix "$PATH_TO_THIS/solids.simple.ref.pix" >
solids.simple.pix.diff 2>> $LOGFILE
+run $PIXDIFF solids.simple.rt.pix "$PATH_TO_THIS/solids.simple.ref.pix" >
solids.simple.pix.diff 2>> $LOGFILE
log "... running tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'"
NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'`
@@ -126,9 +126,8 @@
# then check a complex TGM
# Trim 1025 byte sequence down to exactly 1024.
-log "... running $GENCOLOR -r205 0 16 32 64 128 | dd of=solids.ebm.bw bs=1024
count=1"
rm -f solids.ebm.bw
-$GENCOLOR -r205 0 16 32 64 128 | dd of=solids.ebm.bw bs=1024 count=1 >
$LOGFILE 2>&1
+run $GENCOLOR -r205 0 16 32 64 128 | dd of=solids.ebm.bw bs=1024 count=1 >
$LOGFILE 2>&1
if [ ! -f solids.ebm.bw ] ; then
log "ERROR: Failed to create file 'solids.ebm.bw'"
log "-> solids.sh FAILED, see $LOGFILE"
@@ -137,9 +136,8 @@
fi
# generate required pix file
-log "... running $A2P < $PATH_TO_THIS/solids.dsp.dat > solids.dsp.pix"
rm -f solids.dsp.pix
-$A2P < "$PATH_TO_THIS/solids.dsp.dat" > solids.dsp.pix
+run $A2P < "$PATH_TO_THIS/solids.dsp.dat" > solids.dsp.pix
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"
@@ -176,9 +174,8 @@
exit 1
fi
-log "... running $PIXDIFF solids.rt.pix $PATH_TO_THIS/solids.ref.pix >
solids.pix.diff"
rm -f solids.pix.diff
-$PIXDIFF solids.rt.pix "$PATH_TO_THIS/solids.ref.pix" > solids.pix.diff 2>
$LOGFILE
+run $PIXDIFF solids.rt.pix "$PATH_TO_THIS/solids.ref.pix" > solids.pix.diff 2>
$LOGFILE
tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $0}'
NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'`
Modified: brlcad/branches/RELEASE/regress/spdi/spdi.sh
===================================================================
--- brlcad/branches/RELEASE/regress/spdi/spdi.sh 2020-08-13 14:01:28 UTC
(rev 76730)
+++ brlcad/branches/RELEASE/regress/spdi/spdi.sh 2020-08-13 14:10:48 UTC
(rev 76731)
@@ -122,9 +122,8 @@
EOF
-log "... running $PIXDIFF spdi.pix $PATH_TO_THIS/spdi.ref.pix > spdi.diff.pix"
rm -f spdi.diff.pix
-$PIXDIFF spdi.pix "$PATH_TO_THIS/spdi.ref.pix" > spdi.diff.pix 2>> $LOGFILE
+run $PIXDIFF spdi.pix "$PATH_TO_THIS/spdi.ref.pix" > spdi.diff.pix 2>> $LOGFILE
NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'`
log "spdi.pix $NUMBER_WRONG off by many"
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
