X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fsplit-file.sh;h=eb2c991c1e97d328d120c76fe9915c67fbde93d3;hb=f7d7808a7a0aa4301da16074482ba9547ceff2c8;hp=bc75db497339bcd3cf5d497766ee7259a065def9;hpb=f4b04e8323d4c95c3723ca47587742e7175ae75f;p=pspp-builds.git diff --git a/tests/command/split-file.sh b/tests/command/split-file.sh index bc75db49..eb2c991c 100755 --- a/tests/command/split-file.sh +++ b/tests/command/split-file.sh @@ -5,17 +5,28 @@ 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` 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 } @@ -74,7 +85,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/split.stat +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/split.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare results"