X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fget.sh;h=1ab18044b3cbf9ab9925210768b5772712158d9a;hb=bc0e3fee279da2813183ab2cd17fced06eae09e8;hp=4fddea75d746bc368c6c34e090b6261cc6f6173c;hpb=44d7b18d5c3d0a806fe1a29658445254f2376600;p=pspp

diff --git a/tests/bugs/get.sh b/tests/bugs/get.sh
index 4fddea75d7..1ab18044b3 100755
--- a/tests/bugs/get.sh
+++ b/tests/bugs/get.sh
@@ -7,10 +7,14 @@
 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
@@ -79,14 +83,15 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 
 
 activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF
 LOCATION   EDITOR    SHELL     FREQ
  -------- -------- -------- --------
      1.00     1.00     1.00     2.00 
@@ -97,8 +102,6 @@ LOCATION   EDITOR    SHELL     FREQ
      2.00     1.00     2.00    22.00 
      2.00     2.00     1.00     1.00 
      2.00     2.00     2.00     3.00 
- 
-
 LOCATION   EDITOR    SHELL     FREQ
  -------- -------- -------- --------
      1.00     1.00     1.00     2.00 
@@ -109,7 +112,6 @@ LOCATION   EDITOR    SHELL     FREQ
      2.00     1.00     2.00    22.00 
      2.00     2.00     1.00     1.00 
      2.00     2.00     2.00     3.00 
- 
 EOF
 if [ $? -ne 0 ] ; then fail ; fi