Revision: 76727
http://sourceforge.net/p/brlcad/code/76727
Author: starseeker
Date: 2020-08-13 12:20:08 +0000 (Thu, 13 Aug 2020)
Log Message:
-----------
See if we can make more use of the run function - looks like some failures
aren't ending up triggering script failures?
Modified Paths:
--------------
brlcad/branches/RELEASE/regress/asc/asc2dsp.sh
brlcad/branches/RELEASE/regress/bots/bots.sh
brlcad/branches/RELEASE/regress/comgeom/comgeom.sh
brlcad/branches/RELEASE/regress/dsp/run-dsp-case-set-1.sh
brlcad/branches/RELEASE/regress/dsp/run-dsp-case-set-2.sh
brlcad/branches/RELEASE/regress/dsp/run-dsp-case-set-3.sh
Modified: brlcad/branches/RELEASE/regress/asc/asc2dsp.sh
===================================================================
--- brlcad/branches/RELEASE/regress/asc/asc2dsp.sh 2020-08-13 12:03:20 UTC
(rev 76726)
+++ brlcad/branches/RELEASE/regress/asc/asc2dsp.sh 2020-08-13 12:20:08 UTC
(rev 76727)
@@ -82,12 +82,12 @@
log "... convert dsp data file in asc hex format to pix format"
ASC1="$1/regress/dsp/$BASE1.asc"
rm -f $BASE1.pix
-$A2P < $ASC1 > $BASE1.pix 2>>$LOGFILE
+run $A2P < $ASC1 > $BASE1.pix 2>>$LOGFILE
log "convert pix to bw format"
rm -f $BASE1.bw
# take the blue pixel only
-$P2B -B1.0 $BASE1.pix > $BASE1.bw 2>>$LOGFILE
+run $P2B -B1.0 $BASE1.pix > $BASE1.bw 2>>$LOGFILE
log "convert pix to dsp format"
rm -f $BASE1.dsp
Modified: brlcad/branches/RELEASE/regress/bots/bots.sh
===================================================================
--- brlcad/branches/RELEASE/regress/bots/bots.sh 2020-08-13 12:03:20 UTC
(rev 76726)
+++ brlcad/branches/RELEASE/regress/bots/bots.sh 2020-08-13 12:20:08 UTC
(rev 76727)
@@ -178,7 +178,7 @@
fi
# compare
rm -f bots.rl.diff.pix
-$PIXDIFF bots.rh.pix bots.lh.pix > bots.rl.diff.pix 2>> bots.diff.log
+run $PIXDIFF bots.rh.pix bots.lh.pix > bots.rl.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
tail -n 1 bots.diff.log
@@ -197,7 +197,7 @@
fi
# compare
rm -f bots.rn.diff.pix
-$PIXDIFF bots.rh.pix bots.no.pix > bots.rn.diff.pix 2>> bots.diff.log
+run $PIXDIFF bots.rh.pix bots.no.pix > bots.rn.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
tail -n 1 bots.diff.log
@@ -216,7 +216,7 @@
fi
# compare
rm -f bots.rs.diff.pix
-$PIXDIFF bots.rh.pix bots.sync.pix > bots.rs.diff.pix 2>> bots.diff.log
+run $PIXDIFF bots.rh.pix bots.sync.pix > bots.rs.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
log `tail -n 1 bots.diff.log`
Modified: brlcad/branches/RELEASE/regress/comgeom/comgeom.sh
===================================================================
--- brlcad/branches/RELEASE/regress/comgeom/comgeom.sh 2020-08-13 12:03:20 UTC
(rev 76726)
+++ brlcad/branches/RELEASE/regress/comgeom/comgeom.sh 2020-08-13 12:20:08 UTC
(rev 76727)
@@ -78,7 +78,7 @@
# make our starting database
rm -f comgeom.m35.asc
log "... running gzip decompress"
-$GZIP -d -c "$PATH_TO_THIS/../iges/m35.asc.gz" > comgeom.m35.asc
+run $GZIP -d -c "$PATH_TO_THIS/../iges/m35.asc.gz" > comgeom.m35.asc
rm -f comgeom.m35.g
run $ASC2G comgeom.m35.asc comgeom.m35.g
@@ -87,7 +87,7 @@
#(following example in red.sh and mged test)
rm -f solids regions region_ids
log "... running $VDECK comgeom.m35.g"
-$VDECK comgeom.m35.g >> $LOGFILE 2>&1 <<EOF
+run $VDECK comgeom.m35.g >> $LOGFILE 2>&1 <<EOF
i all.g
d
q
@@ -102,7 +102,7 @@
# get test version
rm -f comgeom.m35-baseline.cg
log "... running gzip decompress"
-$GZIP -d -c "$PATH_TO_THIS/m35.cg.gz" > comgeom.m35-baseline.cg
+run $GZIP -d -c "$PATH_TO_THIS/m35.cg.gz" > comgeom.m35-baseline.cg
cmp comgeom.m35.cg comgeom.m35-baseline.cg
STATUS=$?
Modified: brlcad/branches/RELEASE/regress/dsp/run-dsp-case-set-1.sh
===================================================================
--- brlcad/branches/RELEASE/regress/dsp/run-dsp-case-set-1.sh 2020-08-13
12:03:20 UTC (rev 76726)
+++ brlcad/branches/RELEASE/regress/dsp/run-dsp-case-set-1.sh 2020-08-13
12:20:08 UTC (rev 76727)
@@ -29,17 +29,14 @@
# convert dsp data file in asc format to pix format
DSPASC=$1/regress/dsp/$BASE2.asc
- echo "$A2P < $DSPASC > $BASE2.pix"
- $A2P < $DSPASC > $BASE2.pix
+ run $A2P < $DSPASC > $BASE2.pix
# convert pix to bw format
# take the blue pixel only
- echo "$P2B -B1.0 $BASE2.pix > $BASE2.bw"
- $P2B -B1.0 $BASE2.pix > $BASE2.bw
+ run $P2B -B1.0 $BASE2.pix > $BASE2.bw
# convert pix to dsp format
- echo "$CV huc nu16 $BASE2.bw $BASE2.dsp"
- $CV huc nu16 $BASE2.bw $BASE2.dsp
+ run $CV huc nu16 $BASE2.bw $BASE2.dsp
# build a TGM
$MGED -c > $LOG 2>&1 <<EOF
@@ -50,7 +47,7 @@
EOF
# and raytrace it
- $RT -a45 -e45 -o $BASE2.rt.pix $TGM $BASE2.r 1>> $LOG 2>> $LOG
+ run $RT -a45 -e45 -o $BASE2.rt.pix $TGM $BASE2.r 1>> $LOG 2>> $LOG
STATUS=$?
if [ $STATUS -gt 0 ] ; then
FAILED="`expr $FAILED + 1`"
Modified: brlcad/branches/RELEASE/regress/dsp/run-dsp-case-set-2.sh
===================================================================
--- brlcad/branches/RELEASE/regress/dsp/run-dsp-case-set-2.sh 2020-08-13
12:03:20 UTC (rev 76726)
+++ brlcad/branches/RELEASE/regress/dsp/run-dsp-case-set-2.sh 2020-08-13
12:20:08 UTC (rev 76727)
@@ -31,17 +31,14 @@
# convert dsp data file in asc format to pix format
DSPASC=$1/regress/dsp/$BASE2.asc
- echo "$A2P < $DSPASC > $BASE2.pix"
- $A2P < $DSPASC > $BASE2.pix
+ run $A2P < $DSPASC > $BASE2.pix
# convert pix to bw format
# take the blue pixel only
- echo "$P2B -B1.0 $BASE2.pix > $BASE2.bw"
- $P2B -B1.0 $BASE2.pix > $BASE2.bw
+ run $P2B -B1.0 $BASE2.pix > $BASE2.bw
# convert pix to dsp format
- echo "$CV huc nu16 $BASE2.bw $BASE2.dsp"
- $CV huc nu16 $BASE2.bw $BASE2.dsp
+ run $CV huc nu16 $BASE2.bw $BASE2.dsp
# build a TGM
$MGED -c > $LOG 2>&1 <<EOF
@@ -52,7 +49,7 @@
EOF
# and raytrace it
- $RT -a45 -e45 -o $BASE2.rt.pix $TGM $BASE2.r 1>> $LOG 2>> $LOG
+ run $RT -a45 -e45 -o $BASE2.rt.pix $TGM $BASE2.r 1>> $LOG 2>> $LOG
STATUS=$?
if [ $STATUS -gt 0 ] ; then
FAILED="`expr $FAILED + 1`"
Modified: brlcad/branches/RELEASE/regress/dsp/run-dsp-case-set-3.sh
===================================================================
--- brlcad/branches/RELEASE/regress/dsp/run-dsp-case-set-3.sh 2020-08-13
12:03:20 UTC (rev 76726)
+++ brlcad/branches/RELEASE/regress/dsp/run-dsp-case-set-3.sh 2020-08-13
12:20:08 UTC (rev 76727)
@@ -43,17 +43,14 @@
# convert dsp data file in asc format to pix format
DSPASC=$1/regress/dsp/$BASE2.asc
- echo "$A2P < $DSPASC > $BASE2.pix"
- $A2P < $DSPASC > $BASE2.pix
+ run $A2P < $DSPASC > $BASE2.pix
# convert pix to bw format
# take the blue pixel only
- echo "$P2B -B1.0 $BASE2.pix > $BASE2.bw"
- $P2B -B1.0 $BASE2.pix > $BASE2.bw
+ run $P2B -B1.0 $BASE2.pix > $BASE2.bw
# convert pix to dsp format
- echo "$CV huc nu16 $BASE2.bw $BASE2.dsp"
- $CV huc nu16 $BASE2.bw $BASE2.dsp
+ run $CV huc nu16 $BASE2.bw $BASE2.dsp
# build a TGM
$MGED -c > $LOG 2>&1 <<EOF
@@ -64,7 +61,7 @@
EOF
# and raytrace it
- $RT -a45 -e45 -o $BASE2.rt.pix $TGM $BASE2.r 1>> $LOG 2>> $LOG
+ run $RT -a45 -e45 -o $BASE2.rt.pix $TGM $BASE2.r 1>> $LOG 2>> $LOG
STATUS=$?
if [ $STATUS -gt 0 ] ; then
FAILED="`expr $FAILED + 1`"
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
