X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fvery-long-strings.sh;h=7c09d8dc533265ef1e868955b518a0031d4dec11;hb=d342031c6d0e00840575fb01ab2ea136e674d600;hp=7489915e91ad41bb6f505d23db50dde9faac4464;hpb=ffcce720ea84f37862f8d61e1dc0fa603994bf63;p=pspp-builds.git

diff --git a/tests/command/very-long-strings.sh b/tests/command/very-long-strings.sh
index 7489915e..7c09d8dc 100755
--- a/tests/command/very-long-strings.sh
+++ b/tests/command/very-long-strings.sh
@@ -13,7 +13,8 @@ top_srcdir=`cd $top_srcdir; pwd`
 top_builddir=`cd $top_builddir; pwd`
 PSPP=$top_builddir/src/ui/terminal/pspp
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
@@ -22,6 +23,7 @@ cleanup()
 	echo "NOT cleaning $TEMPDIR"
      	return ; 
      fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -71,7 +73,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program 0"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null $TESTFILE 
+$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE 
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare variable display 0"
@@ -162,7 +164,7 @@ EOF
 
 
     activity="run program 1 ($options)"
-    $SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
+    $SUPERVISOR $PSPP --testing-mode $TESTFILE
     if [ $? -ne 0 ] ; then no_result ; fi
 
     activity="Create file2 ($options)"
@@ -183,14 +185,14 @@ EOF
     if [ $? -ne 0 ] ; then no_result ; fi
 
     activity="run program 2 ($options)"
-    $SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
+    $SUPERVISOR $PSPP --testing-mode $TESTFILE
     if [ $? -ne 0 ] ; then no_result ; fi
 
 
 # Check that the file read back in has the same data as what we wrote.
 
     activity="compare print ($options)"
-    diff --text -b $TEMPDIR/out.txt $TEMPDIR/data
+    diff -b $TEMPDIR/out.txt $TEMPDIR/data
     if [ $? -ne 0 ] ; then fail ; fi