X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Flag.sh;h=d5eadb0e1ac19fb034fed664730d826445cdff0e;hb=352d48a9cf76667dd4824326c7151df70e90d7a1;hp=db7c2969325a9f2db934d02dfa921d903b0350c6;hpb=b26094b483f97d89025df65a30523a65e716790a;p=pspp

diff --git a/tests/command/lag.sh b/tests/command/lag.sh
index db7c296932..d5eadb0e1a 100755
--- a/tests/command/lag.sh
+++ b/tests/command/lag.sh
@@ -3,17 +3,24 @@
 # This program tests the LAG function
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
-here=`pwd`;
+# ensure that top_builddir  are absolute
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
 # ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $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
 }
 
@@ -47,7 +54,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TEMPDIR/lag.stat <<EOF
-data list /w 1.
+data list /W 1.
 begin data.
 1
 2
@@ -56,26 +63,26 @@ begin data.
 5
 end data.
 
-compute x=lag(w,1).
-compute y=lag(x).
-compute z=lag(w,2).
+compute X=lag(w,1).
+compute Y=lag(x).
+compute Z=lag(w,2).
 list.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$here/../src/pspp -o raw-ascii $TEMPDIR/lag.stat
+$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/lag.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare result"
-diff -b -B $TEMPDIR/pspp.list - <<EOF
-1.1 DATA LIST.  Reading 1 record from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - <<EOF
+1.1 DATA LIST.  Reading 1 record from INLINE.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
 #========#======#=======#======#
 |W       |     1|  1-  1|F1.0  |
 +--------+------+-------+------+
-
 W        X        Y        Z
 - -------- -------- --------
 1      .        .        .