X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fcommand%2Fdata-list.sh;h=fc42b94ca077a78c50b52fca819c010f00153c8c;hb=cbdfa35f7fb46948d1ee8aee7b7438cf1a5fd44c;hp=814a9d225c46315e06476ca0870916fc07243fb7;hpb=92bfefccd465052e492f669ce561aa25b0110283;p=pspp

diff --git a/tests/command/data-list.sh b/tests/command/data-list.sh
index 814a9d225c..fc42b94ca0 100755
--- a/tests/command/data-list.sh
+++ b/tests/command/data-list.sh
@@ -3,17 +3,24 @@
 # This program tests the DATA LIST input program.
 
 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,16 @@ 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
+2X22|34|23|
+3|34|34X34
+end data.
+
+list.
+
 data list free/A B C D.
 begin data.
 ,1,2,3
@@ -90,11 +106,26 @@ 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 $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
+1.1 DATA LIST.  Reading free-form data from INLINE.
++--------+------+
+|Variable|Format|
+#========#======#
+|A       |F8.0  |
+|B       |F8.0  |
+|C       |F8.0  |
+|D       |F8.0  |
++--------+------+
+       A        B        C        D
+-------- -------- -------- --------
+    1.00    23.00    45.00     2.03 
+    2.00    22.00    34.00    23.00 
+    3.00    34.00    34.00    34.00 
        A        B        C        D
 -------- -------- -------- --------
      .       1.00     2.00     3.00 
@@ -103,7 +134,6 @@ diff -b -B $TEMPDIR/pspp.list - << EOF
      .00     1.00      .        .   
      .        .        .        .   
     2.00     3.00     4.00     5.00 
-
        A        B        C        D
 -------- -------- -------- --------
     1.00     2.00     3.00     4.00