X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fsplit-file.sh;h=eb2c991c1e97d328d120c76fe9915c67fbde93d3;hb=38d5e09c01ddffc98430c3c55ed3ccb821180cbf;hp=666f39dd3ba58f136812adb20d7bd08d398b1b4d;hpb=b26094b483f97d89025df65a30523a65e716790a;p=pspp-builds.git

diff --git a/tests/command/split-file.sh b/tests/command/split-file.sh
index 666f39dd..eb2c991c 100755
--- a/tests/command/split-file.sh
+++ b/tests/command/split-file.sh
@@ -3,17 +3,31 @@
 # This program tests the split file command
 
 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
 }
 
@@ -49,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
@@ -71,14 +85,14 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$here/../src/pspp -o raw-ascii $TEMPDIR/split.stat
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/split.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF
 Variable Value Label
 X            1
-
 X Y
 - -
 1 2 
@@ -87,10 +101,8 @@ X Y
 1 9 
 1 5 
 1 4 
-
 Variable Value Label
 X            2
-
 X Y
 - -
 2 7