X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fget.sh;h=740b7b5cde162e1e9b250414fe7236647521c679;hb=9804b8c5512567ed20901fd1d66e209ccdde342c;hp=3a57df03443a60abf950cc0189c1123ee0204bb5;hpb=721f67e477ee5050961020ed5afd8e0daf42bf2d;p=pspp-builds.git

diff --git a/tests/bugs/get.sh b/tests/bugs/get.sh
index 3a57df03..740b7b5c 100755
--- a/tests/bugs/get.sh
+++ b/tests/bugs/get.sh
@@ -1,21 +1,24 @@
 #!/bin/sh
 
 # This program tests for a bug which caused
-# the second procedure after GET FILE to corrupt it's output
+# the second procedure after GET FILE to corrupt its output
 
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 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
 }
 
@@ -48,8 +51,8 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/prog.sps <<EOF
-DATA LIST LIST NOTABLE /location * editor * shell * freq * .
+cat > $TESTFILE <<EOF
+DATA LIST LIST NOTABLE /LOCATION * EDITOR * SHELL * FREQ * .
 BEGIN DATA.
     1.00     1.00    1.0     2.00
     1.00     1.00    2.0    30.00
@@ -74,13 +77,17 @@ LIST.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
+
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
+
+
 activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF
 LOCATION   EDITOR    SHELL     FREQ
  -------- -------- -------- --------
      1.00     1.00     1.00     2.00 
@@ -91,8 +98,6 @@ LOCATION   EDITOR    SHELL     FREQ
      2.00     1.00     2.00    22.00 
      2.00     2.00     1.00     1.00 
      2.00     2.00     2.00     3.00 
- 
-
 LOCATION   EDITOR    SHELL     FREQ
  -------- -------- -------- --------
      1.00     1.00     1.00     2.00 
@@ -103,7 +108,6 @@ LOCATION   EDITOR    SHELL     FREQ
      2.00     1.00     2.00    22.00 
      2.00     2.00     1.00     1.00 
      2.00     2.00     2.00     3.00 
- 
 EOF
 if [ $? -ne 0 ] ; then fail ; fi