X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-1s.sh;h=2b45701c97ff3385433901b1b59b1703e80dae67;hb=f7d7808a7a0aa4301da16074482ba9547ceff2c8;hp=30402bda176f04e86449e2b983a80910bc272d3c;hpb=1339492699ce7e12c9bf9fa17f9d60a66024cbd1;p=pspp-builds.git

diff --git a/tests/command/t-test-1s.sh b/tests/command/t-test-1s.sh
index 30402bda..2b45701c 100755
--- a/tests/command/t-test-1s.sh
+++ b/tests/command/t-test-1s.sh
@@ -5,16 +5,26 @@
 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`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -64,36 +74,35 @@ 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 $TEMPDIR/pspp.list - <<EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF
+1.1 DATA LIST.  Reading free-form data from INLINE.
 +--------+------+
 |Variable|Format|
 #========#======#
 |ID      |F8.0  |
 |ABC     |F8.0  |
 +--------+------+
-
 2.1 T-TEST.  One-Sample Statistics
 #===#=#====#==============#========#
 #   #N|Mean|Std. Deviation|SE. Mean#
 #===#=#====#==============#========#
-#ABC#6|3.00|           .84|    .342#
+#ABC#6|3.00|           .84|     .34#
 #===#=#====#==============#========#
-
 2.2 T-TEST.  One-Sample Test
-#===#=====================================================#
-#   #                Test Value = 2.000000                #
-#   #-----+--+---------------+---------------+------------#
-#   #     |  |               |               |    95%     #
-#   #     |  |               |               +-----+------#
-#   #  t  |df|Sig. (2-tailed)|Mean Difference|Lower| Upper#
-#===#=====#==#===============#===============#=====#======#
-#ABC#2.928| 5|           .033|          1.000|.1220|1.8780#
-#===#=====#==#===============#===============#=====#======#
+#===#===================================================#
+#   #               Test Value = 2.000000               #
+#   #----+--+---------------+---------------+-----------#
+#   #    |  |               |               |    95%    #
+#   #    |  |               |               +-----+-----#
+#   #  t |df|Sig. (2-tailed)|Mean Difference|Lower|Upper#
+#===#====#==#===============#===============#=====#=====#
+#ABC#2.93| 5|            .03|           1.00|  .12| 1.88#
+#===#====#==#===============#===============#=====#=====#
 EOF
 if [ $? -ne 0 ] ; then fail ; fi