X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Ft-test-alpha.sh;h=663889138b573ca56660e759eaaaf5c9c1f62dbc;hb=1e50874d6b62e8a39dd54cc17cfc2f48dcd621b7;hp=73392c323299bfd2abc0188c8a7ca3a9b0a43229;hpb=d043fde2b737897e3372670afc47eb648c17624b;p=pspp-builds.git

diff --git a/tests/bugs/t-test-alpha.sh b/tests/bugs/t-test-alpha.sh
index 73392c32..66388913 100755
--- a/tests/bugs/t-test-alpha.sh
+++ b/tests/bugs/t-test-alpha.sh
@@ -7,16 +7,22 @@
 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
 }
 
@@ -50,7 +56,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TESTFILE <<EOF
-data list list /id * indep (a1) dep1 * dep2 *.
+data list list /ID * INDEP (a1) DEP1 * DEP2 *.
 begin data.
 1  'a' 1 3
 2  'a' 2 4
@@ -72,12 +78,13 @@ 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|
 #========#======#
@@ -86,24 +93,22 @@ diff -B -b $TEMPDIR/pspp.list - <<EOF
 |DEP1    |F8.0  |
 |DEP2    |F8.0  |
 +--------+------+
-
 2.1 T-TEST.  Group Statistics
-#==========#=#====#==============#========#
-#     INDEP|N|Mean|Std. Deviation|SE. Mean#
-#==========#=#====#==============#========#
-#DEP1 a    |5|2.00|          .707|    .316#
-#     b    |5|4.00|          .707|    .316#
-#DEP2 a    |5|4.00|          .707|    .316#
-#     b    |5|2.00|          .707|    .316#
-#==========#=#====#==============#========#
-
+#=============#=#====#==============#========#
+#       INDEP |N|Mean|Std. Deviation|SE. Mean#
+#=============#=#====#==============#========#
+#DEP1 a       |5|2.00|          .707|    .316#
+#     b       |5|4.00|          .707|    .316#
+#DEP2 a       |5|4.00|          .707|    .316#
+#     b       |5|2.00|          .707|    .316#
+#=============#=#====#==============#========#
 2.2 T-TEST.  Independent Samples Test
 #===============================#==========#===============================================================================#
 #                               # Levene's |                          t-test for Equality of Means                         #
 #                               #----+-----+------+-----+---------------+---------------+---------------------+------------#
-#                               #    |     |      |     |               |               |                     |    95%     #
+#                               #    |     |      |     |               |               |                     |     95%    #
 #                               #    |     |      |     |               |               |                     +------+-----#
-#                               # F  | Sig.|   t  |  df |Sig. (2-tailed)|Mean Difference|Std. Error Difference| Lower|Upper#
+#                               #  F | Sig.|   t  |  df |Sig. (2-tailed)|Mean Difference|Std. Error Difference| Lower|Upper#
 #===============================#====#=====#======#=====#===============#===============#=====================#======#=====#
 #DEP1Equal variances assumed    #.000|1.000|-4.472|    8|           .002|         -2.000|                 .447|-3.031|-.969#
 #    Equal variances not assumed#    |     |-4.472|8.000|           .002|         -2.000|                 .447|-3.031|-.969#