Made BSD diff compatible

[pspp] / tests / command / oneway-with-splits.sh

diff --git a/tests/command/oneway-with-splits.sh b/tests/command/oneway-with-splits.sh
index c9eec5d55b5243396f1a5c84ed9607273cd3ba8f..4de772137164eeb28a4edb45bdcb55a37af2c160 100755 (executable)
--- a/tests/command/oneway-with-splits.sh
+++ b/tests/command/oneway-with-splits.sh
@@ -11,12 +11,18 @@ here=`pwd`;
 # ensure that top_srcdir is absolute
 cd $top_srcdir; top_srcdir=`pwd`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
 {
-     rm -rf $TEMPDIR
+    if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo Not cleaning $TEMPDIR;
+       return ; 
+    fi
+    cd /
+    rm -rf $TEMPDIR
 }
 
 
@@ -49,7 +55,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TESTFILE <<EOF
-DATA LIST LIST /quality * brand * s *.
+DATA LIST LIST /QUALITY * BRAND * S *.
 BEGIN DATA
 3 1 1
 2 1 1
@@ -89,7 +95,8 @@ activity="run program"
 $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-diff -b -B $TEMPDIR/pspp.list - << EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|