X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Finput-crash.sh;h=fd4694da288c64a54247d9f3765af40b7d0e916d;hb=fe425c89a0080e781a6fb67e36d050c74cb50c09;hp=d76528811903e9c62fa2ede0fa6ce41ecf937a1f;hpb=7f3ac8559f71179a95fad28a30882ca476d8ac99;p=pspp

diff --git a/tests/bugs/input-crash.sh b/tests/bugs/input-crash.sh
index d765288119..fd4694da28 100755
--- a/tests/bugs/input-crash.sh
+++ b/tests/bugs/input-crash.sh
@@ -6,10 +6,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$EXEEXT
 
 # 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
@@ -21,6 +25,7 @@ cleanup()
 	echo "NOT cleaning $TEMPDIR"
      	return ; 
      fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -68,9 +73,27 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 # The above syntax is invalid, so this program should fail to parse
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -o pspp.csv -e /dev/null $TESTFILE 
 if [ $? -ne 1 ] ; then fail ; fi
 
 
+activity="create test program 2"
+cat > $TESTFILE <<EOF
+* From bug #21108.
+input program.
+data list list /x.
+end file.
+end input program.
+
+descriptives x.
+EOF
+if [ $? -ne 0 ] ; then no_result ; fi
+
+
+# The above syntax is invalid, so this program should fail to parse
+activity="run program 2"
+$SUPERVISOR $PSPP -o pspp.csv -e /dev/null $TESTFILE
+if [ $? -ne 1 ] ; then fail ; fi
+
 
 pass;