X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fcommand%2Flongvars.sh;h=a57e57323d7a3a5b6079a0eb061656d7d34be294;hb=f51ecb480;hp=22ee75fbe1667a7dba7a9553b772af11de0df4db;hpb=1339492699ce7e12c9bf9fa17f9d60a66024cbd1;p=pspp

diff --git a/tests/command/longvars.sh b/tests/command/longvars.sh
index 22ee75fbe1..a57e57323d 100755
--- a/tests/command/longvars.sh
+++ b/tests/command/longvars.sh
@@ -5,16 +5,28 @@
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
 
-here=`pwd`;
+# ensure that top_builddir  are absolute
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
 # ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $top_srcdir; pwd`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
+LANG=C
+export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -65,53 +77,39 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
-+--------------+------+
-|   Variable   |Format|
-#==============#======#
-|AlphaBetaGamma|F8.0  |
-|B             |F8.0  |
-|X             |F8.0  |
-|Yabbadabbadoo |F8.0  |
-+--------------+------+
-
-AlphaBetaGamma        B        X Yabbadabbadoo
--------------- -------- -------- -------------
-          2.00     3.00     4.00          5.00 
-
-2.1 CROSSTABS.  Summary.
-#===============#=====================================================#
-#               #                        Cases                        #
-#               #-----------------+-----------------+-----------------#
-#               #      Valid      |     Missing     |      Total      #
-#               #--------+--------+--------+--------+--------+--------#
-#               #       N| Percent|       N| Percent|       N| Percent#
-#---------------#--------+--------+--------+--------+--------+--------#
-#X *            #       1|  100.0%|       0|    0.0%|       1|  100.0%#
-#Yabbadabbadoo  #        |        |        |        |        |        #
-#===============#========#========#========#========#========#========#
-
-2.2 CROSSTABS.  X by Yabbadabbadoo [count].
-#===============#==============================================================#========#
-#               #                         Yabbadabbadoo                        |        #
-#               #--------+--------+--------+--------+--------+--------+--------+        #
-#              X#    1.00|    2.00|    3.00|    4.00|    5.00|    6.00|    7.00|  Total #
-#---------------#--------+--------+--------+--------+--------+--------+--------+--------#
-#           1.00#      .0|      .0|      .0|      .0|      .0|      .0|      .0|      .0#
-#           2.00#      .0|      .0|      .0|      .0|      .0|      .0|      .0|      .0#
-#           3.00#      .0|      .0|      .0|      .0|      .0|      .0|      .0|      .0#
-#           4.00#      .0|      .0|      .0|      .0|     1.0|      .0|      .0|     1.0#
-#           5.00#      .0|      .0|      .0|      .0|      .0|      .0|      .0|      .0#
-#           6.00#      .0|      .0|      .0|      .0|      .0|      .0|      .0|      .0#
-#           7.00#      .0|      .0|      .0|      .0|      .0|      .0|      .0|      .0#
-#Total          #     .0%|     .0%|     .0%|     .0%|    1.0%|     .0%|     .0%|    1.0%#
-#===============#========#========#========#========#========#========#========#========#
-
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+AlphaBetaGamma,F8.0
+B,F8.0
+X,F8.0
+Yabbadabbadoo,F8.0
+
+Table: Data List
+AlphaBetaGamma,B,X,Yabbadabbadoo
+2.00,3.00,4.00,5.00
+
+Table: Summary.
+,Cases,,,,,
+,Valid,,Missing,,Total,
+,N,Percent,N,Percent,N,Percent
+X * Yabbadabbadoo,1,100.0%,0,0.0%,1,100.0%
+
+Table: X * Yabbadabbadoo [count].
+,Yabbadabbadoo,,,,,,,
+X,1.00,2.00,3.00,4.00,5.00,6.00,7.00,Total
+1.00,.0,.0,.0,.0,.0,.0,.0,.0
+2.00,.0,.0,.0,.0,.0,.0,.0,.0
+3.00,.0,.0,.0,.0,.0,.0,.0,.0
+4.00,.0,.0,.0,.0,1.0,.0,.0,1.0
+5.00,.0,.0,.0,.0,.0,.0,.0,.0
+6.00,.0,.0,.0,.0,.0,.0,.0,.0
+7.00,.0,.0,.0,.0,.0,.0,.0,.0
+Total,.0,.0,.0,.0,1.0,.0,.0,1.0
 EOF
 if [ $? -ne 0 ] ; then fail ; fi