Revision: 76724
http://sourceforge.net/p/brlcad/code/76724
Author: starseeker
Date: 2020-08-13 00:12:47 +0000 (Thu, 13 Aug 2020)
Log Message:
-----------
Fixes for regression test quoting - seen in odd pathnames test
Modified Paths:
--------------
brlcad/branches/RELEASE/regress/comgeom/comgeom.sh
brlcad/branches/RELEASE/regress/lights/lights.sh
brlcad/branches/RELEASE/regress/moss/moss.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/comgeom/comgeom.sh
===================================================================
--- brlcad/branches/RELEASE/regress/comgeom/comgeom.sh 2020-08-12 20:59:40 UTC
(rev 76723)
+++ brlcad/branches/RELEASE/regress/comgeom/comgeom.sh 2020-08-13 00:12:47 UTC
(rev 76724)
@@ -78,7 +78,7 @@
# make our starting database
rm -f comgeom.m35.asc
log "... running gzip decompress"
-$GZIP -d -c "$PATH_TO_THIS/m35.asc.gz" > comgeom.m35.asc
+$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
Modified: brlcad/branches/RELEASE/regress/lights/lights.sh
===================================================================
--- brlcad/branches/RELEASE/regress/lights/lights.sh 2020-08-12 20:59:40 UTC
(rev 76723)
+++ brlcad/branches/RELEASE/regress/lights/lights.sh 2020-08-13 00:12:47 UTC
(rev 76724)
@@ -100,9 +100,9 @@
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
+$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}'`
+NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'`
log "lights.pix $NUMBER_WRONG off by many"
if [ X$NUMBER_WRONG = X0 ] ; then
Modified: brlcad/branches/RELEASE/regress/moss/moss.sh
===================================================================
--- brlcad/branches/RELEASE/regress/moss/moss.sh 2020-08-12 20:59:40 UTC
(rev 76723)
+++ brlcad/branches/RELEASE/regress/moss/moss.sh 2020-08-13 00:12:47 UTC
(rev 76724)
@@ -134,8 +134,8 @@
else
log "... running $PIXDIFF moss.pix $PATH_TO_THIS/moss.ref.pix >
moss.pix.diff"
rm -f moss.pix.diff
- $PIXDIFF moss.pix $PATH_TO_THIS/moss.ref.pix > moss.pix.diff 2>>
$LOGFILE
- different="`tail -n1 $LOGFILE | tr , '\012' | grep many`"
+ $PIXDIFF moss.pix "$PATH_TO_THIS/moss.ref.pix" > moss.pix.diff 2>>
$LOGFILE
+ different="`tail -n1 "$LOGFILE" | tr , '\012' | grep many`"
log "moss.pix vs $PATH_TO_THIS/moss.ref.pix differences:"
log "$different"
fi
@@ -152,7 +152,7 @@
rm -f moss.roundtrip.diff
$PIXDIFF moss.pix moss.pix.png.pix > moss.roundtrip.diff 2>> $LOGFILE
- NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
+ NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'`
log "moss.pix $NUMBER_WRONG off by many"
fi
Modified: brlcad/branches/RELEASE/regress/shaders/shaders.sh
===================================================================
--- brlcad/branches/RELEASE/regress/shaders/shaders.sh 2020-08-12 20:59:40 UTC
(rev 76723)
+++ brlcad/branches/RELEASE/regress/shaders/shaders.sh 2020-08-13 00:12:47 UTC
(rev 76724)
@@ -78,7 +78,8 @@
$GENCOLOR -r205 0 16 32 64 128 | dd of=shaders.ebm.bw bs=1024 count=1 2>>
$LOGFILE
-EAGLECAD=$PATH_TO_THIS/shaders.eagleCAD-512x438.pix
+EAGLECAD=shaders.eagleCAD-working.pix
+cp "$PATH_TO_THIS/shaders.eagleCAD-512x438.pix" $EAGLECAD
log "... creating shader geometry file (shaders.g)"
rm -f shaders.mged shaders.g shaders.rt shaders.half.prj shaders.ell_2.prj
@@ -92,7 +93,7 @@
in half.s half 0 0 1 -1
r half.r u half.s
-prj_add shaders.half.prj $EAGLECAD 512 438
+prj_add shaders.half.prj "$EAGLECAD" 512 438
mater half.r "stack prj shaders.half.prj;plastic di=.8 sp=.3" 76 158 113 0
g all.g half.r
@@ -190,7 +191,7 @@
center -640 -1280 100
size 300
press top
-prj_add shaders.ell_2.prj $EAGLECAD 512 438
+prj_add shaders.ell_2.prj "$EAGLECAD" 512 438
mater ell_2.r "stack prj shaders.ell_2.prj;plastic di=.9" 200 200 200 0
#
@@ -220,6 +221,7 @@
if [ ! -f shaders.rt ] ; then
log "ERROR: mged failed to create shaders.rt"
log "-> shaders.sh FAILED, see $LOGFILE"
+ rm -f $EAGLECAD
cat $LOGFILE
exit 1
fi
@@ -250,7 +252,8 @@
if [ ! -f shaders.rt.pix ] ; then
log "ERROR: shaders raytrace failed to create shaders.rt.pix"
log "-> shaders.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ rm -f $EAGLECAD
+ cat "$LOGFILE"
exit 1
fi
@@ -259,9 +262,9 @@
else
log "... running $PIXDIFF shaders.rt.pix $PATH_TO_THIS/shaders.ref.pix >
shaders.rt.diff.pix"
rm -f shaders.rt.diff.pix
- $PIXDIFF shaders.rt.pix $PATH_TO_THIS/shaders.ref.pix >
shaders.rt.diff.pix 2>> $LOGFILE
+ $PIXDIFF shaders.rt.pix "$PATH_TO_THIS/shaders.ref.pix" >
shaders.rt.diff.pix 2>> $LOGFILE
- NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}' |
tail -${TAIL_N}1`
+ NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'
| tail -${TAIL_N}1`
log "shaders.rt.pix $NUMBER_WRONG off by many"
fi
@@ -270,9 +273,10 @@
log "-> shaders.sh succeeded"
else
log "-> shaders.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
+rm -f $EAGLECAD
exit $NUMBER_WRONG
# Local Variables:
Modified: brlcad/branches/RELEASE/regress/solids/solids.sh
===================================================================
--- brlcad/branches/RELEASE/regress/solids/solids.sh 2020-08-12 20:59:40 UTC
(rev 76723)
+++ brlcad/branches/RELEASE/regress/solids/solids.sh 2020-08-13 00:12:47 UTC
(rev 76724)
@@ -108,10 +108,10 @@
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
+$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}'`
+NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'`
log "solids.simple.rt.pix $NUMBER_WRONG off by many"
if [ X$NUMBER_WRONG = X0 ] ; then
@@ -178,10 +178,10 @@
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
+$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}'`
+tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $0}'
+NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'`
log "solids.rt.pix $NUMBER_WRONG off by many"
Modified: brlcad/branches/RELEASE/regress/spdi/spdi.sh
===================================================================
--- brlcad/branches/RELEASE/regress/spdi/spdi.sh 2020-08-12 20:59:40 UTC
(rev 76723)
+++ brlcad/branches/RELEASE/regress/spdi/spdi.sh 2020-08-13 00:12:47 UTC
(rev 76724)
@@ -124,8 +124,8 @@
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
-NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
+$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"
@@ -133,7 +133,7 @@
log "-> spdi.sh succeeded"
else
log "-> spdi.sh FAILED, see $LOGFILE"
- cat $LOGFILE
+ cat "$LOGFILE"
fi
exit $NUMBER_WRONG
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
