X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Faggregate.sh;h=b85edba304dc7c32c21c2c4f921833a000b2cb30;hb=ee5220fe34ba25c47120fe5dc2e6e266cb439e92;hp=9c7f4c12aeb8fa20f7c1b6dd20a4d2b1427b3423;hpb=44d7b18d5c3d0a806fe1a29658445254f2376600;p=pspp-builds.git

diff --git a/tests/command/aggregate.sh b/tests/command/aggregate.sh
index 9c7f4c12..b85edba3 100755
--- a/tests/command/aggregate.sh
+++ b/tests/command/aggregate.sh
@@ -6,10 +6,12 @@ TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/aggregate.pspp
 
 
-here=`pwd`;
-
-# ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`pwd`
+# ensure that top_srcdir and top_builddir  are absolute
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+top_srcdir=`cd $top_srcdir; pwd`
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
 
 STAT_CONFIG_PATH=$top_srcdir/config
@@ -166,7 +168,7 @@ G        N       NI      NU     NUI NFGT2 NFGT2I SFGT2 SFGT2I NFIN23 NFIN23I SFI
 4     1.00     1.00       1       1  .      .     .     1.000   .       .      .       .000  .      .     .      .000      .       .              4    .        .       .       1.000     .      .            4    .     .          4      .        .      .     .          4      .00      .00      .00     1.00     1.00     1.00     1.00      .00       0       0       0       1       1        1       1        0    .      .     .   100.0     .       .      .       .0    .      .     .      .0      .        .       .     100.0      .        .        .        .   
 EOF
 
-for outfile in active external; do
+for outfile in scratch active external; do
     for sort in presorted unsorted; do
 	for missing in itemwise columnwise; do
 	    name=$outfile-$sort-$missing
@@ -182,8 +184,10 @@ for outfile in active external; do
 		echo "aggregate"
 		if [ "$outfile" = "active" ]; then
 		    echo "	outfile=*"
-		else
+		elif [ "$outfile" = "external" ]; then
 		    echo "	outfile='aggregate.sys'"
+		else
+		    echo "	outfile=#AGGREGATE"
 		fi
 		if [ "$sort" = "presorted" ]; then
 		    echo "	/presorted"
@@ -194,17 +198,20 @@ for outfile in active external; do
 		cat agg-skel.pspp
 		if [ "$outfile" = "external" ]; then
 		    echo "get file='aggregate.sys'."
+		elif [ "$outfile" = "scratch" ]; then
+		    echo "get file=#AGGREGATE."
 		fi
 		echo "list."
 	    } > $name.pspp
 	    if [ $? -ne 0 ] ; then no_result ; fi
 	    
 	    activity="run $name.pspp"
-	    $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $name.pspp >/dev/null 2>&1
+	    $SUPERVISOR $PSPP --testing-mode -o raw-ascii $name.pspp >/dev/null 2>&1
 	    if [ $? -ne 0 ] ; then no_result ; fi
 
 	    activity="check $name output"
-	    diff -b -w -B pspp.list agg-$missing.out
+	    perl -pi -e 's/^\s*$//g' pspp.list agg-$missing.out
+	    diff -b -w pspp.list agg-$missing.out
 	    if [ $? -ne 0 ] ; then fail ; fi
 	done
     done