Clean up output subsystem.

[pspp-builds.git] / tests / command / t-test-pairs.sh

diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh
index 58f6f94739f6f590ceba9b01898ea1388aad7fde..a228cffbdb8c7f3d55a3b046ba49a4b772fd844a 100755 (executable)
--- a/tests/command/t-test-pairs.sh
+++ b/tests/command/t-test-pairs.sh
@@ -5,16 +5,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
 }
 
@@ -47,8 +53,8 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
-data list list /id * a * b *.
+cat > $TESTFILE <<EOF
+data list list /ID * A * B *.
 begin data.
 1 2.0 3.0
 2 1.0 2.0
@@ -63,12 +69,13 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $PSPP -o raw-ascii $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|
 #========#======#
@@ -76,7 +83,6 @@ diff -B -b $TEMPDIR/pspp.list - <<EOF
 |A       |F8.0  |
 |B       |F8.0  |
 +--------+------+
-
 2.1 T-TEST.  Paired Sample Statistics
 #========#====#=#==============#========#
 #        #Mean|N|Std. Deviation|SE. Mean#
@@ -84,19 +90,17 @@ diff -B -b $TEMPDIR/pspp.list - <<EOF
 #Pair 0 A#2.00|5|          .707|    .316#
 #       B#4.00|5|         1.541|    .689#
 #========#====#=#==============#========#
-
 2.2 T-TEST.  Paired Samples Correlations
 #======#=====#=#===========#====#
 #      |     #N|Correlation|Sig.#
 #======#=====#=#===========#====#
 #Pair 0|A & B#5|       .918|.028#
 #======#=====#=#===========#====#
-
 2.3 T-TEST.  Paired Samples Test
 #===========#=====================================================#======#==#===============#
 #           #                  Paired Differences                 |      |  |               #
 #           #-------+--------------+---------------+--------------+      |  |               #
-#           #       |              |               |     95%      |      |  |               #
+#           #       |              |               |95% Confidence|      |  |               #
 #           #       |              |               +-------+------+      |  |               #
 #           #  Mean |Std. Deviation|Std. Error Mean| Lower | Upper|   t  |df|Sig. (2-tailed)#
 #===========#=======#==============#===============#=======#======#======#==#===============#