X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Flist.sh;h=277e6197d75164cf4f6a92500e5710c73e46bf58;hb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;hp=098d84649dd88e7e0c8034dab65f361f2ed5454e;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp diff --git a/tests/command/list.sh b/tests/command/list.sh index 098d84649d..277e6197d7 100755 --- a/tests/command/list.sh +++ b/tests/command/list.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps 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 top_srcdir=`cd $top_srcdir; pwd` @@ -16,9 +17,15 @@ top_srcdir=`cd $top_srcdir; pwd` 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 } @@ -59,7 +66,7 @@ data list file='$top_srcdir/tests/weighting.data'/AVAR 1-5 BVAR 6-10. weight by BVAR. list. *list /cases=from 5 to 20 by 2 /format numbered. -list /format numbered weight. +list /format numbered. *** Multiple lines. data list file='$top_srcdir/tests/list.data' notable /X000 to X126 1-127. @@ -71,182 +78,182 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o pspp.csv $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare results" -perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list -diff -b $TEMPDIR/pspp.list - <