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

diff --git a/tests/command/autorecod.sh b/tests/command/autorecod.sh
index 2ef03f9f..e956fcfa 100755
--- a/tests/command/autorecod.sh
+++ b/tests/command/autorecod.sh
@@ -3,17 +3,31 @@
 # This program tests the autorecode command
 
 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
 
+LANG=C
+export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -46,9 +60,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,31 +75,31 @@ 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 $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="test output"
-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|
 #========#======#=======#======#
 |X       |     1|  1-  5|A5    |
 |Y       |     1|  7-  7|F1.0  |
 +--------+------+-------+------+
-
     X Y        A        B
 ----- - -------- --------
 lasdj 1     1.00     3.00 
@@ -97,7 +111,6 @@ asdfj 9     4.00     1.00
 lajks 9     2.00     1.00 
 asdfk 0     3.00     4.00 
 asdfk 1     3.00     3.00 
-
     X Y        A        B        Z        W
 ----- - -------- -------- -------- --------
 lasdj 1     1.00     3.00      .00     1.00