X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Flist.sh;h=477ac8ba634909085cd1ad45b3fbc3e057015325;hb=053e7ff6e0a45a25d5604b211e9c950fff50e75d;hp=8b96af218e1b022673b0c856d31406bb559466bd;hpb=f10ed4942f0f2253d236d5e454a8ab702ed7e72b;p=pspp diff --git a/tests/command/list.sh b/tests/command/list.sh index 8b96af218e..477ac8ba63 100755 --- a/tests/command/list.sh +++ b/tests/command/list.sh @@ -3,17 +3,20 @@ # This program tests the LIST command. 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,52 +50,38 @@ cd $TEMPDIR activity="create program" -cat > $TEMPDIR/list.stat << foobar +cat > $TESTFILE << EOF *** Single lines. -remark EOF ----------------------------------------------------------------------- -Testing use of LIST in single-line cases. ----------------------------------------------------------------------- -EOF -data list file='$here/weighting.data'/AVAR 1-5 BVAR 6-10. +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. *** Multiple lines. -remark EOF ----------------------------------------------------------------------- -Testing use of LIST in multi-line cases. ----------------------------------------------------------------------- -EOF -data list file='$here/list.data' notable /X000 to X126 1-127. +data list file='$top_srcdir/tests/list.data' notable /X000 to X126 1-127. *list /cases=from 1 to 25 by 5 /format numbered. list x000 to x030. list /cases=from 1 to 25. -foobar +EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/list.stat +$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare results" -diff -b -B $TEMPDIR/pspp.list - <