X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fautorecod.sh;h=2ebdc6c758af1340d40968b393a70611350e05da;hb=7d9a47fdc83e4adda2a8b2ee1406f277c4ffe2b8;hp=2ef03f9f25c48487268adb59335de5353cd4e762;hpb=362ef6aa0dde26bc7ae7b2c042b47f96b8b1bca1;p=pspp-builds.git

diff --git a/tests/command/autorecod.sh b/tests/command/autorecod.sh
index 2ef03f9f..2ebdc6c7 100755
--- a/tests/command/autorecod.sh
+++ b/tests/command/autorecod.sh
@@ -3,17 +3,21 @@
 # This program tests the autorecode command
 
 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
 }
 
@@ -46,9 +50,9 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/prog.sps <<EOF
+cat > $TESTFILE <<EOF
 /* Tries AUTORECODE on some random but similar strings of characters.
-data list /x 1-5(a) y 7.
+data list /X 1-5(a) Y 7.
 begin data.
 lasdj 1 1                                                           3
 asdfk 0 3 <---- These are the numbers that should be produced for a 4
@@ -61,23 +65,24 @@ asdfk 0 3 These are the numbers that should be produced for b ----> 4
 asdfk 1 3                                                           3
 end data.
 
-autorecode x y into a b/descend.
+autorecode x y into A B/descend.
 
 list.
 /* Just to make sure it works on second & subsequent executions,
 /* try it again.
-compute z=trunc(y/2).
-autorecode z into w.
+compute Z=trunc(y/2).
+autorecode z into W.
 list.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$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="test output"
-diff -b -B $TEMPDIR/pspp.list - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - <<EOF |perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|