X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fautorecod.sh;h=47e00239acf26930ab06a3c2ea2c53752ea27992;hb=2b1e8448aee0d326ad5c2f805c27ee4f39b4a447;hp=98b2c078dd1f03357103bc3377a7235d685b35fe;hpb=1339492699ce7e12c9bf9fa17f9d60a66024cbd1;p=pspp-builds.git

diff --git a/tests/command/autorecod.sh b/tests/command/autorecod.sh
index 98b2c078..47e00239 100755
--- a/tests/command/autorecod.sh
+++ b/tests/command/autorecod.sh
@@ -6,16 +6,24 @@ 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()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -75,19 +83,19 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp    -o raw-ascii $TESTFILE
+$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 
@@ -99,7 +107,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