X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-groups.sh;h=53080bdf8b12c31c6bb4dfd35cca650886cc8a39;hb=64322c8ee0af7bf5ecc825ccc90513118732f335;hp=a8dfdd6c2eed8ea0fa02213f34a4be0b807accb2;hpb=ccf2f45c091ce1555b4e2a36186c501675c18a59;p=pspp-builds.git

diff --git a/tests/command/t-test-groups.sh b/tests/command/t-test-groups.sh
index a8dfdd6c..53080bdf 100755
--- a/tests/command/t-test-groups.sh
+++ b/tests/command/t-test-groups.sh
@@ -3,17 +3,28 @@
 # This program tests that the T-TEST /GROUPS command works
 
 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
 }
 
@@ -46,33 +57,37 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
-data list list /id * indep * dep1 * dep2 *.
+cat > $TESTFILE <<EOF
+data list list /ID * INDEP * DEP1 * DEP2 *.
 begin data.
-1  1 1 3
-2  1 2 4
-3  1 2 4 
-4  1 2 4 
-5  1 3 5
-6  2 3 1
-7  2 4 2
-8  2 4 2
-9  2 4 2
-10 2 5 3
+1  1.1 1 3
+2  1.1 2 4
+3  1.1 2 4 
+4  1.1 2 4 
+5  1.1 3 5
+6  2.1 3 1
+7  2.1 4 2
+8  2.1 4 2
+9  2.1 4 2
+10 2.1 5 3
+11 3.1 2 2
 end data.
 
-t-test /GROUPS=indep(1,2) /var=dep1 dep2.
+* Note that this last case should be IGNORED since it doesn't have a dependent variable of either 1 or 2
+
+t-test /GROUPS=indep(1.1,2.1) /var=dep1 dep2.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$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 | perl -e 's/^\s*$//g'
+1.1 DATA LIST.  Reading free-form data from INLINE.
 +--------+------+
 |Variable|Format|
 #========#======#
@@ -86,10 +101,10 @@ diff -B -b $TEMPDIR/pspp.list - <<EOF
 #==========#=#====#==============#========#
 #     INDEP|N|Mean|Std. Deviation|SE. Mean#
 #==========#=#====#==============#========#
-#DEP1 1    |5|2.00|          .707|    .316#
-#     2    |5|4.00|          .707|    .316#
-#DEP2 1    |5|4.00|          .707|    .316#
-#     2    |5|2.00|          .707|    .316#
+#DEP1 1.1  |5|2.00|          .707|    .316#
+#     2.1  |5|4.00|          .707|    .316#
+#DEP2 1.1  |5|4.00|          .707|    .316#
+#     2.1  |5|2.00|          .707|    .316#
 #==========#=#====#==============#========#
 
 2.2 T-TEST.  Independent Samples Test