[brlcad-commits] SF.net SVN: brlcad:[51142] brlcad/trunk/regress

[<tbr...@us...>]

Revision: 51142
          http://brlcad.svn.sourceforge.net/brlcad/?rev=51142&view=rev
Author:   tbrowder2
Date:     2012-06-14 20:49:50 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
add new regression test; turn on dsp and asc2dsp regression tests; distcheck seems okay

Modified Paths:
--------------
    brlcad/trunk/regress/CMakeLists.txt
    brlcad/trunk/regress/Makefile.am

Added Paths:
-----------
    brlcad/trunk/regress/asc2dsp.sh
    brlcad/trunk/regress/dsp/asc2dsp-new.asc
    brlcad/trunk/regress/dsp/asc2dsp-old.asc

Modified: brlcad/trunk/regress/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/CMakeLists.txt	2012-06-14 20:48:23 UTC (rev 51141)
+++ brlcad/trunk/regress/CMakeLists.txt	2012-06-14 20:49:50 UTC (rev 51142)
@@ -97,6 +97,10 @@
     ${SH_EXEC} ${CMAKE_SOURCE_DIR}/regress/dsp.sh ${CMAKE_SOURCE_DIR}
     DEPENDS mged cv asc2pix rt pix-bw
     )
+  add_custom_target(regress-asc2dsp
+    ${SH_EXEC} ${CMAKE_SOURCE_DIR}/regress/asc2dsp.sh ${CMAKE_SOURCE_DIR}
+    DEPENDS cv asc2pix pix-bw asc2dsp
+    )
 
   add_custom_target(regress
     DEPENDS regress-mged regress-moss regress-lights
@@ -104,6 +108,7 @@
     regress-weight regress-gqa regress-fastgen regress-bots
     regress-repository regress-red regress-nirt
     regress-vls_vprintf regress-comgeom regress-gnff regress-gdot
+    regress-dsp regress-asc2dsp
     )
 
 endif(SH_EXEC)
@@ -111,9 +116,12 @@
 CMAKEFILES(
   Makefile.am
   analyze.asc
+  asc2dsp.sh
   bots.sh
   comgeom.sh
   dsp.sh
+  dsp/asc2dsp-new.asc
+  dsp/asc2dsp-old.asc
   dsp/dsp-1-1.asc
   dsp/dsp-1-2.asc
   dsp/dsp-2-1.asc
@@ -186,6 +194,11 @@
 set(regress_outfiles
   .density
   adj_air.pl
+  asc2dsp-new.dsp
+  asc2dsp-old.bw
+  asc2dsp-old.dsp
+  asc2dsp-old.pix
+  asc2dsp.log
   bots.diff.log
   bots.diff.pix
   bots.g

Modified: brlcad/trunk/regress/Makefile.am
===================================================================
--- brlcad/trunk/regress/Makefile.am	2012-06-14 20:48:23 UTC (rev 51141)
+++ brlcad/trunk/regress/Makefile.am	2012-06-14 20:49:50 UTC (rev 51142)
@@ -1,4 +1,4 @@
-.PHONY : regression regress test mged red moss lights solids shaders spdi iges weight gqa fastgen bots repository comgeom gdot gnff vls_vprintf dsp
+.PHONY : regression regress test mged red moss lights solids shaders spdi iges weight gqa fastgen bots repository comgeom gdot gnff vls_vprintf dsp asc2dsp
 
 SUBDIRS = mged
 
@@ -86,8 +86,13 @@
 	-${SH} $(top_srcdir)/regress/dsp.sh $(top_srcdir)
 	@${ECHO} +++ $@ test complete.
 
+asc2dsp: $(top_srcdir)/regress/asc2dsp.sh
+	-${SH} $(top_srcdir)/regress/asc2dsp.sh $(top_srcdir)
+	@${ECHO} +++ $@ test complete.
+
 # these are here because they go in the distribution but are not installed
 EXTRA_DIST = \
+	asc2dsp.sh \
 	bots.sh \
 	comgeom.sh \
 	dsp.sh \
@@ -127,6 +132,11 @@
 	$(MOSTLYCLEANFILES) \
 	.density \
 	adj_air.pl \
+        asc2dsp-new.dsp \
+        asc2dsp-old.bw \
+        asc2dsp-old.dsp \
+        asc2dsp-old.pix \
+        asc2dsp.log \
 	bots.g \
 	bots.lh.pix \
 	bots.log \

Added: brlcad/trunk/regress/asc2dsp.sh
===================================================================
--- brlcad/trunk/regress/asc2dsp.sh	                        (rev 0)
+++ brlcad/trunk/regress/asc2dsp.sh	2012-06-14 20:49:50 UTC (rev 51142)
@@ -0,0 +1,127 @@
+#!/bin/sh
+#                      A S C 2 D S P . S H
+# BRL-CAD
+#
+# Copyright (c) 2010-2012 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+###
+
+# Ensure /bin/sh
+export PATH || (echo "This isn't sh."; sh $0 $*; kill $$)
+
+# source common library functionality, setting ARGS, NAME_OF_THIS,
+# PATH_TO_THIS, and THIS.
+. "$1/regress/library.sh"
+
+
+FAILED=0
+
+A2D="`ensearch asc2dsp`"
+if test ! -f "$A2D" ; then
+    echo "Unable to find asc2dsp, aborting"
+    FAILED=1
+fi
+
+CV="`ensearch cv`"
+if test ! -f "$CV" ; then
+    echo "Unable to find cv, aborting"
+    FAILED=1
+fi
+
+A2P="`ensearch asc2pix`"
+if test ! -f "$A2P" ; then
+    echo "Unable to find asc2pix, aborting"
+    FAILED=1
+fi
+
+P2B="`ensearch pix-bw`"
+if test ! -f "$P2B" ; then
+    echo "Unable to find pix-bw, aborting"
+    FAILED=1
+fi
+
+if [ $FAILED -ne 0 ] ; then
+    echo "Unable to find pix-bw, aborting"
+    echo "-> asc2dsp.sh ABORTED"
+    exit 1
+fi
+
+FAILED=0
+
+BASE1=asc2dsp-old
+BASE2=asc2dsp-new
+LOG=asc2dsp.log
+
+TRASH="$LOG $BASE1.pix $BASE1.bw $BASE1.dsp $BASE2.dsp"
+
+rm -f $TRASH
+
+# we generate one dsp file the old way and one the new way--they should be identical
+# old first
+# convert dsp data file in asc hex format to pix format
+ASC1=$1/regress/dsp/$BASE1.asc
+$A2P < $ASC1 > $BASE1.pix 2>>$LOG
+# convert pix to bw format
+# take the blue pixel only
+$P2B -B $BASE1.pix > $BASE1.bw 2>>$LOG
+# convert pix to dsp format
+$CV huc nu16 $BASE1.bw $BASE1.dsp 1>>$LOG 2>>$LOG
+
+# new
+# convert dsp data file in asc decimal format to dsp format
+ASC2=$1/regress/dsp/$BASE2.asc
+$A2D $BASE2.asc $BASE2.dsp 1>>$LOG 2>>$LOG
+
+# the two dsp files should be identical
+cmp $BASE1.dsp $BASE2.dsp
+STATUS=$?
+
+if [ $STATUS -gt 0 ] ; then
+  FAILED=1
+fi
+
+if [ $FAILED = 0 ] ; then
+    echo "-> asc2dsp.sh succeeded"
+else
+    echo "-> asc2dsp.sh FAILED"
+fi
+
+exit $FAILED
+
+# Local Variables:
+# mode: sh
+# tab-width: 8
+# sh-indentation: 4
+# sh-basic-offset: 4
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=4 tabstop=8


Property changes on: brlcad/trunk/regress/asc2dsp.sh
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + text/x-sh
Added: svn:eol-style
   + native

Added: brlcad/trunk/regress/dsp/asc2dsp-new.asc
===================================================================
--- brlcad/trunk/regress/dsp/asc2dsp-new.asc	                        (rev 0)
+++ brlcad/trunk/regress/dsp/asc2dsp-new.asc	2012-06-14 20:49:50 UTC (rev 51142)
@@ -0,0 +1,18 @@
+0 
+1 
+2 
+3 
+4 
+5 
+6 
+7 
+8 
+9 
+10 
+011
+12 
+13 
+14
+15 
+16
+


Property changes on: brlcad/trunk/regress/dsp/asc2dsp-new.asc
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: brlcad/trunk/regress/dsp/asc2dsp-old.asc
===================================================================
--- brlcad/trunk/regress/dsp/asc2dsp-old.asc	                        (rev 0)
+++ brlcad/trunk/regress/dsp/asc2dsp-old.asc	2012-06-14 20:49:50 UTC (rev 51142)
@@ -0,0 +1,18 @@
+0x0000 
+0x0001
+0x0002
+0x0003
+0x0004
+0x0005
+0x0006
+0x0007
+0x0008
+0x0009
+0x000a
+0x000b
+0x000c
+0x000d
+0x000e
+0x000f
+0x0010
+


Property changes on: brlcad/trunk/regress/dsp/asc2dsp-old.asc
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.