X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fsplit-file.sh;h=9762292dd1a890d49781363e5e741ce09fa1f2e8;hb=9c6eaf297d6220842264e72c44686b26d47474d1;hp=2f2c98b4612873d2693e577ca94f14d1aec3a319;hpb=a19e7749cdb8713316fde220f2fc9a5ad5dc79ed;p=pspp-builds.git

diff --git a/tests/command/split-file.sh b/tests/command/split-file.sh
index 2f2c98b4..9762292d 100755
--- a/tests/command/split-file.sh
+++ b/tests/command/split-file.sh
@@ -5,16 +5,29 @@
 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$EXEEXT
 
 # 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
 }
 
@@ -50,7 +63,7 @@ activity="create program"
 cat > $TEMPDIR/split.stat <<EOF
 title 'Test SPLIT FILE utility'.
 
-data list notable /x 1 y 2.
+data list notable /X 1 Y 2.
 begin data.
 12
 16
@@ -72,35 +85,37 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/split.stat
+$SUPERVISOR $PSPP -o pspp.csv $TEMPDIR/split.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
-Variable Value Label
-X            1
-
-X Y
-- -
-1 2 
-1 6 
-1 7 
-1 9 
-1 5 
-1 4 
-
-Variable Value Label
-X            2
-
-X Y
-- -
-2 7 
-2 0 
-2 6 
-2 5 
-2 8 
-2 9 
-2 4
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Title: Test SPLIT FILE utility
+
+Variable,Value,Label
+X,1,
+
+Table: Data List
+X,Y
+1,2
+1,6
+1,7
+1,9
+1,5
+1,4
+
+Variable,Value,Label
+X,2,
+
+Table: Data List
+X,Y
+2,7
+2,0
+2,6
+2,5
+2,8
+2,9
+2,4
 EOF
 if [ $? -ne 0 ] ; then fail ; fi