X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fcommand%2Fsample.sh;h=eb58b061e39eb17003045b978bea16c52ba65930;hb=04ffc94fe6e7940dd49bf3185048ba99aee58442;hp=277593fad66b5e3b219395c966407168314a1406;hpb=a19e7749cdb8713316fde220f2fc9a5ad5dc79ed;p=pspp

diff --git a/tests/command/sample.sh b/tests/command/sample.sh
index 277593fad6..eb58b061e3 100755
--- a/tests/command/sample.sh
+++ b/tests/command/sample.sh
@@ -5,16 +5,26 @@
 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$EXEEXT
 
 # 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()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -51,7 +61,7 @@ activity="create program"
 cat > $TEMPDIR/sample.stat <<EOF
 set seed=3
 
-data list notable /a 1-2.
+data list notable /A 1-2.
 begin data.
 1
 2
@@ -71,22 +81,21 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii --testing-mode $TEMPDIR/sample.stat 
+$SUPERVISOR $PSPP -o pspp.csv $TEMPDIR/sample.stat 
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="create head"
-grep -v '^\ *$' $TEMPDIR/pspp.list | head -2 > $TEMPDIR/head
+grep -v '^[ 
]*$' $TEMPDIR/pspp.csv | head -1 > $TEMPDIR/head
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="extract data"
-grep  '[0-9][0-9]*' $TEMPDIR/pspp.list > $TEMPDIR/data
+grep  '[0-9][0-9]*' $TEMPDIR/pspp.csv > $TEMPDIR/data
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare head"
-diff -B -b $TEMPDIR/head - << EOF
- A
---
+diff -b $TEMPDIR/head - << EOF
+Table: Data List
 EOF
 if [ $? -ne 0 ] ; then fail ; fi