X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fdata-list.sh;h=99b94aa5b15e7829a1069421b5654f873d7d9565;hb=b08603f631a2d998d8c604692fdf13669bb5e510;hp=fce515c6a74f540e09a54e6f358d9ba57b5ecf19;hpb=20fd432b34d65999f06fabfa8e9c3f5efbac41bd;p=pspp

diff --git a/tests/command/data-list.sh b/tests/command/data-list.sh
index fce515c6a7..99b94aa5b1 100755
--- a/tests/command/data-list.sh
+++ b/tests/command/data-list.sh
@@ -3,17 +3,20 @@
 # This program tests the DATA LIST input program.
 
 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
 }
 
@@ -47,7 +50,7 @@ cd $TEMPDIR
 
 # Create command file.
 activity="create program"
-cat > $TEMPDIR/data-list.stat << EOF
+cat > $TESTFILE << EOF
 data list list ('|','X') /A B C D.
 begin data.
 1|23X45|2.03
@@ -99,11 +102,12 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii --testing-mode $TEMPDIR/data-list.stat # > $TEMPDIR/errs
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare 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 free-form data from the command file.
 +--------+------+
 |Variable|Format|