Thread: [Brlcad-commits] CVS: brlcad/regress gqa.sh,14.5,14.6 iges.sh,14.6,14.7 lights.sh,14.5,14.6 moss.sh,
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Update of /cvsroot/brlcad/brlcad/regress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6113 Modified Files: gqa.sh iges.sh lights.sh moss.sh shaders.sh slave_build.sh solids.sh spdi.sh weight.sh Log Message: Updates to make it easier to check the status of a regression test. Each test now reports its notion of whether it succeeded or failed. Index: gqa.sh =================================================================== RCS file: /cvsroot/brlcad/brlcad/regress/gqa.sh,v retrieving revision 14.5 retrieving revision 14.6 diff -w -u -r14.5 -r14.6 --- gqa.sh 6 Dec 2005 17:13:00 -0000 14.5 +++ gqa.sh 20 Apr 2006 15:19:53 -0000 14.6 @@ -71,8 +71,12 @@ GQA="../src/gtools/g_qa -u m,m^3,kg -g 0.25m-0.5mm -p" export GQA +STATUS=0 +export STATUS - +# +# somehow need to check results of these +# CMD="$GQA -Ao gqa.g overlaps" echo $CMD echo $CMD >> gqa.log @@ -135,3 +139,10 @@ echo $CMD echo $CMD >> gqa.log 2>&1 $CMD >> gqa.log 2>&1 + + +if [ $STATUS == 0 ] ; then + /bin/echo '-> iges.sh succeeded' +else + /bin/echo '-> iges.sh failed' +endif Index: iges.sh =================================================================== RCS file: /cvsroot/brlcad/brlcad/regress/iges.sh,v retrieving revision 14.6 retrieving revision 14.7 diff -w -u -r14.6 -r14.7 --- iges.sh 15 Nov 2005 03:22:27 -0000 14.6 +++ iges.sh 20 Apr 2006 15:19:53 -0000 14.7 @@ -39,4 +39,12 @@ /bin/echo g-iges/iges-g completed successfully fi + +if [ $STATUS == 0 ] ; then + /bin/echo '-> iges.sh succeeded' +else + /bin/echo '-> iges.sh failed' +endif + + exit $STATUS Index: lights.sh =================================================================== RCS file: /cvsroot/brlcad/brlcad/regress/lights.sh,v retrieving revision 14.5 retrieving revision 14.6 diff -w -u -r14.5 -r14.6 --- lights.sh 25 Aug 2005 18:40:45 -0000 14.5 +++ lights.sh 20 Apr 2006 15:19:53 -0000 14.6 @@ -39,7 +39,13 @@ ../src/conv/asc2pix < $1/regress/lights_ref.asc > lights_ref.pix ../src/util/pixdiff lights.pix lights_ref.pix > lights_diff.pix 2>> lights.log NUMBER_WRONG=`tr , '\012' < lights.log | awk '/many/ {print $1}'` -/bin/echo -n lights.pix $NUMBER_WRONG off by many +/bin/echo lights.pix $NUMBER_WRONG off by many + +if [ $NUMBER_WRONG == 0 ] ; then + /bin/echo '-> lights.sh succeeded' +else + /bin/echo '-> lights.sh failed' +endif exit $NUMBER_WRONG Index: moss.sh =================================================================== RCS file: /cvsroot/brlcad/brlcad/regress/moss.sh,v retrieving revision 14.4 retrieving revision 14.5 diff -w -u -r14.4 -r14.5 --- moss.sh 23 Oct 2005 04:44:27 -0000 14.4 +++ moss.sh 20 Apr 2006 15:19:53 -0000 14.5 @@ -71,7 +71,15 @@ ../src/util/pixdiff moss.pix moss2.pix > moss_png.diff 2> moss-png.log NUMBER_WRONG=`tr , '\012' < moss-png.log | awk '/many/ {print $1}'` echo moss.pix $NUMBER_WRONG off by many + +if [ $NUMBER_WRONG == 0 ] ; then + /bin/echo '-> moss.sh succeeded' +else + /bin/echo '-> moss.sh failed' +endif + exit $NUMBER_WRONG + # Local Variables: # mode: sh # tab-width: 8 Index: shaders.sh =================================================================== RCS file: /cvsroot/brlcad/brlcad/regress/shaders.sh,v retrieving revision 14.9 retrieving revision 14.10 diff -w -u -r14.9 -r14.10 --- shaders.sh 6 Feb 2006 20:09:57 -0000 14.9 +++ shaders.sh 20 Apr 2006 15:19:53 -0000 14.10 @@ -224440,6 +224440,12 @@ fi fi +if [ $NUMBER_WRONG == 0 ] ; then + /bin/echo '-> shaders.sh succeeded' +else + /bin/echo '-> shaders.sh failed' +endif + exit $NUMBER_WRONG # Local Variables: # mode: sh Index: slave_build.sh =================================================================== RCS file: /cvsroot/brlcad/brlcad/regress/slave_build.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -w -u -r1.4 -r1.5 --- slave_build.sh 20 Apr 2006 15:15:16 -0000 1.4 +++ slave_build.sh 20 Apr 2006 15:19:53 -0000 1.5 @@ -53,22 +53,22 @@ # case $MYNAME in wopr) - export CONF_FLAGS="" ; + export CONF_FLAGS="--enable-everything" ; export MAKE_CMD="make" ; export MAKE_OPTS="-j11" ;; liu) - export CONF_FLAGS="" ; + export CONF_FLAGS="--enable-everything" ; export MAKE_CMD="make" ; export MAKE_OPTS="-j2" ;; amdws2) - export CONF_FLAGS="" ; + export CONF_FLAGS="--enable-everything" ; export MAKE_CMD="make" ; export MAKE_OPTS="-j2" ;; vast) - export CONF_FLAGS="CC=cc CFLAGS=-64 LDFLAGS=-64 --enable-64bit-build" ; + export CONF_FLAGS="CC=cc CFLAGS=-64 LDFLAGS=-64 --enable-everything --enable-64bit-build" ; export MAKE_CMD="/usr/gnu/bin/make" ; export MAKE_OPTS="-j5" ;; @@ -127,10 +127,16 @@ # # run the regression tests # -if [ -s build.log ] ; then +if [ ! -s build.log ] ; then + echo build failed zero length log + exit 1 +fi + cd regress make test > test.log 2>&1 +if [ X`grep failed test.log` != X ] ; then + /bin/echo regression test failed else - echo build failed zero length log - exit 1 + /bin/echo regression test succeeded fi +make install Index: solids.sh =================================================================== RCS file: /cvsroot/brlcad/brlcad/regress/solids.sh,v retrieving revision 14.6 retrieving revision 14.7 diff -w -u -r14.6 -r14.7 --- solids.sh 18 Dec 2005 00:29:04 -0000 14.6 +++ solids.sh 20 Apr 2006 15:19:53 -0000 14.7 @@ -902,6 +902,12 @@ NUMBER_WRONG=`tr , '\012' < solids-diff.log | awk '/many/ {print $1}'` /bin/echo solids.pix $NUMBER_WRONG off by many +if [ $NUMBER_WRONG == 0 ] ; then + /bin/echo '-> solids.sh succeeded' +else + /bin/echo '-> solids.sh failed' +endif + exit $NUMBER_WRONG # Local Variables: Index: spdi.sh =================================================================== RCS file: /cvsroot/brlcad/brlcad/regress/spdi.sh,v retrieving revision 14.5 retrieving revision 14.6 diff -w -u -r14.5 -r14.6 --- spdi.sh 23 Oct 2005 04:44:27 -0000 14.5 +++ spdi.sh 20 Apr 2006 15:19:53 -0000 14.6 @@ -57,6 +57,12 @@ NUMBER_WRONG=`tr , '\012' < spdi.log | awk '/many/ {print $1}'` /bin/echo spdi.pix $NUMBER_WRONG off by many +if [ $NUMBER_WRONG == 0 ] ; then + /bin/echo '-> spdi.sh succeeded' +else + /bin/echo '-> spdi.sh failed' +endif + exit $NUMBER_WRONG # Local Variables: # mode: sh Index: weight.sh =================================================================== RCS file: /cvsroot/brlcad/brlcad/regress/weight.sh,v retrieving revision 14.7 retrieving revision 14.8 diff -w -u -r14.7 -r14.8 --- weight.sh 23 Oct 2005 04:44:27 -0000 14.7 +++ weight.sh 20 Apr 2006 15:19:53 -0000 14.8 @@ -64,4 +64,11 @@ rm -f wgt.out_ns weight.ref_ns +if [ $STATUS == 0 ] ; then + /bin/echo '-> weight.sh succeeded' +else + /bin/echo '-> weight.sh failed' +endif + + exit $STATUS |