X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fsplit-file.sh;h=10e34ed9e229a913cf820612bea63c55f0a9f687;hb=8a7f5c28b68af3cd03a524329c1d6e7eba355158;hp=7a992a16af6fbd421e430665c707f57e4ea7f71e;hpb=7e8eec6839205801adddbd6fafb2ceaf7c601d08;p=pspp-builds.git

diff --git a/tests/command/split-file.sh b/tests/command/split-file.sh
index 7a992a16..10e34ed9 100755
--- a/tests/command/split-file.sh
+++ b/tests/command/split-file.sh
@@ -5,14 +5,21 @@
 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()
 {
@@ -74,15 +81,14 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/split.stat
+$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/split.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF
 Variable Value Label
 X            1
-
 X Y
 - -
 1 2 
@@ -91,10 +97,8 @@ X Y
 1 9 
 1 5 
 1 4 
-
 Variable Value Label
 X            2
-
 X Y
 - -
 2 7