X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-1-indep-val.sh;h=2490490130e6561098440e6b6b22e97765b181c0;hb=dacfe37faf6837e1e69b75e0f3791f06a3efa68d;hp=89f2a038b40589160db6f77798b22a7cded6ea8c;hpb=06f9ee45954e5e71fa7f6262dbf37defa1dbf996;p=pspp-builds.git

diff --git a/tests/command/t-test-1-indep-val.sh b/tests/command/t-test-1-indep-val.sh
index 89f2a038..24904901 100755
--- a/tests/command/t-test-1-indep-val.sh
+++ b/tests/command/t-test-1-indep-val.sh
@@ -4,17 +4,24 @@
 # when a single value in the independent variable is given.
 
 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()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -47,8 +54,8 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
-data list list /indep * dep *.
+cat > $TESTFILE <<EOF
+data list list /INDEP * DEP *.
 begin data.
        1        6
        1        6
@@ -79,31 +86,30 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$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|
 #========#======#
 |INDEP   |F8.0  |
 |DEP     |F8.0  |
 +--------+------+
-
 2.1 T-TEST.  Group Statistics
 #===========#==#====#==============#========#
 #     INDEP | N|Mean|Std. Deviation|SE. Mean#
 #===========#==#====#==============#========#
-#DEP < 1.514|11|8.00|         2.864|    .863#
-#    >=1.514|11|9.00|         3.821|   1.152#
+#DEP >=1.514|11|9.00|         3.821|   1.152#
+#    <1.514 |11|8.00|         2.864|    .863#
 #===========#==#====#==============#========#
-
 2.2 T-TEST.  Independent Samples Test
 #==============================#=========#===============================================================================#
-#                              #Levene's |                          t-test for Equality of Means                         #
+#                              # Levene's|                          t-test for Equality of Means                         #
 #                              #----+----+-----+------+---------------+---------------+---------------------+------------#
 #                              #    |    |     |      |               |               |                     |    95%     #
 #                              #    |    |     |      |               |               |                     +------+-----#