Revision: 76889
http://sourceforge.net/p/brlcad/code/76889
Author: starseeker
Date: 2020-08-22 15:31:32 +0000 (Sat, 22 Aug 2020)
Log Message:
-----------
The 'old' test doesn't run - input file reports invalid characters - but the
new one does run. Rather than completely turn off the test, run the conversion
that does work.
Modified Paths:
--------------
brlcad/trunk/regress/asc/CMakeLists.txt
brlcad/trunk/regress/asc/asc2dsp.sh
Modified: brlcad/trunk/regress/asc/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/asc/CMakeLists.txt 2020-08-22 14:40:56 UTC (rev
76888)
+++ brlcad/trunk/regress/asc/CMakeLists.txt 2020-08-22 15:31:32 UTC (rev
76889)
@@ -7,8 +7,8 @@
endif (TARGET asc2g)
- #add_test(NAME regress-asc2dsp COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/asc2dsp.sh" ${CMAKE_SOURCE_DIR})
- #BRLCAD_REGRESSION_TEST(regress-asc2dsp "cv;asc2pix;pix-bw;asc2dsp"
TEST_DEFINED)
+ add_test(NAME regress-asc2dsp COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/asc2dsp.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-asc2dsp "cv;asc2pix;pix-bw;asc2dsp"
TEST_DEFINED)
endif(SH_EXEC)
Modified: brlcad/trunk/regress/asc/asc2dsp.sh
===================================================================
--- brlcad/trunk/regress/asc/asc2dsp.sh 2020-08-22 14:40:56 UTC (rev 76888)
+++ brlcad/trunk/regress/asc/asc2dsp.sh 2020-08-22 15:31:32 UTC (rev 76889)
@@ -54,53 +54,54 @@
exit 1
fi
-CV="`ensearch cv`"
-if test ! -f "$CV" ; then
- log "Unable to find cv, aborting"
- exit 1
-fi
+#CV="`ensearch cv`"
+#if test ! -f "$CV" ; then
+# log "Unable to find cv, aborting"
+# exit 1
+#fi
+#
+#A2P="`ensearch asc2pix`"
+#if test ! -f "$A2P" ; then
+# log "Unable to find asc2pix, aborting"
+# exit 1
+#fi
+#
+#P2B="`ensearch pix-bw`"
+#if test ! -f "$P2B" ; then
+# log "Unable to find pix-bw, aborting"
+# exit 1
+#fi
-A2P="`ensearch asc2pix`"
-if test ! -f "$A2P" ; then
- log "Unable to find asc2pix, aborting"
- exit 1
-fi
-P2B="`ensearch pix-bw`"
-if test ! -f "$P2B" ; then
- log "Unable to find pix-bw, aborting"
- exit 1
-fi
-
-
-BASE1=asc2dsp-old
+#BASE1=asc2dsp-old
BASE2=asc2dsp-new
# we generate one dsp file the old way and one the new way--they should be
identical
# old first
-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
+#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
+#
+#log "convert pix to bw format"
+#rm -f $BASE1.bw
+## take the blue pixel only
+#$P2B -B1.0 $BASE1.pix > $BASE1.bw 2>>$LOGFILE
+#
+#log "convert pix to dsp format"
+#rm -f $BASE1.dsp
+#run $CV huc nu16 $BASE1.bw $BASE1.dsp
-log "convert pix to bw format"
-rm -f $BASE1.bw
-# take the blue pixel only
-$P2B -B1.0 $BASE1.pix > $BASE1.bw 2>>$LOGFILE
-
-log "convert pix to dsp format"
-rm -f $BASE1.dsp
-run $CV huc nu16 $BASE1.bw $BASE1.dsp
-
log "convert dsp data file in asc decimal format to dsp format"
ASC2="$1/regress/dsp/$BASE2.asc"
rm -f $BASE2.dsp
-run $A2D $BASE2.asc $BASE2.dsp
+run $A2D $ASC2 $BASE2.dsp
+STATUS=$?
# the two dsp files should be identical
-run cmp $BASE1.dsp $BASE2.dsp
-STATUS=$?
+#run cmp $BASE1.dsp $BASE2.dsp
+#STATUS=$?
if [ $STATUS -gt 0 ] ; then
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
