Fixed blank replacement

[pspp-builds.git] / tests / bugs / multipass.sh

diff --git a/tests/bugs/multipass.sh b/tests/bugs/multipass.sh
index bd4c2c396c991037de567c2d167f6d22972f89d7..98ad523b60d32a5e08b08f9100d7e2ce58af7c68 100755 (executable)
--- a/tests/bugs/multipass.sh
+++ b/tests/bugs/multipass.sh
@@ -11,11 +11,13 @@ 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()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -49,7 +51,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TESTFILE <<EOF
-data list list /id * abc *.
+data list list /ID * ABC *.
 begin data.
 1 3.5
 2 2.0
@@ -72,7 +74,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -80,7 +83,6 @@ diff -b -B -w $TEMPDIR/pspp.list - << EOF
 |ID      |F8.0  |
 |ABC     |F8.0  |
 +--------+------+
-
 2.1 DESCRIPTIVES.  Valid cases = 6; cases with missing value(s) = 0.
 +--------#-+-----+-------+-------+-------+
 |Variable#N| Mean|Std Dev|Minimum|Maximum|