X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fbugs%2Fagg-crash-2.sh;h=39d0ac0a8b496c4331f959ca0a0fce581381094c;hb=65e4b2dda3939a9c35913a79b7e79c3120713a6c;hp=01aa218b83b90fa4b9f62838d7ca1b2cef8e523d;hpb=1d985886f778e35f8d89c4e3c897b79fde8de6ed;p=pspp-builds.git

diff --git a/tests/bugs/agg-crash-2.sh b/tests/bugs/agg-crash-2.sh
index 01aa218b..39d0ac0a 100755
--- a/tests/bugs/agg-crash-2.sh
+++ b/tests/bugs/agg-crash-2.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 /x (F8.2) y (a25).
+DATA LIST LIST /X (F8.2) Y (a25).
 
 BEGIN DATA.
 87.50 foo
@@ -59,7 +61,7 @@ END DATA.
 
 
 
-AGGREGATE OUTFILE=* /BREAK=y /x=MAX(x).
+AGGREGATE OUTFILE=* /BREAK=y /X=MAX(x).
 LIST /x y.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
@@ -67,7 +69,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 $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|
@@ -75,11 +78,10 @@ diff -b -B -w $TEMPDIR/pspp.list - << EOF
 |X       |F8.2  |
 |Y       |A25   |
 +--------+------+
-
-       X                         Y
--------- -------------------------
-   87.34 bar                       
-   87.50 foo                       
+        X                         Y
+--------- -------------------------
+    87.34 bar                       
+    87.50 foo                       
 EOF
 if [ $? -ne 0 ] ; then fail ; fi