Clean up output subsystem.

[pspp-builds.git] / tests / command / examine-extremes.sh

diff --git a/tests/command/examine-extremes.sh b/tests/command/examine-extremes.sh
index b10fdbca5afc0fa8821f0f296eb4da4e896dc4bd..5a428aae7b94e2c4735e2fbab376e46f6ae9b8fd 100755 (executable)
--- a/tests/command/examine-extremes.sh
+++ b/tests/command/examine-extremes.sh
@@ -5,10 +5,14 @@
 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`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -85,11 +89,12 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
-diff -b -B $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
 1.1 EXAMINE.  Case Processing Summary
 #==#===============================#
 #  #             Cases             #
@@ -100,26 +105,24 @@ diff -b -B $TEMPDIR/pspp.list - << EOF
 #==#==#=======#=#=======#==#=======#
 #V1#23|   100%|0|     0%|23|   100%#
 #==#==#=======#=#=======#==#=======#
-
 1.2 EXAMINE.  Extreme Values
-#==========#===========#=====#
-#          #Case Number|Value#
-#==========#===========#=====#
-#V1Highest1#         21|20.00#
-#         2#         20|19.00#
-#         3#         19|18.00#
-#         4#         19|18.00#
-#         5#         18|17.00#
-#         6#         17|16.00#
-#  --------#-----------+-----#
-#   Lowest1#          1| 1.00#
-#         2#          2| 2.00#
-#         3#          4| 3.00#
-#         4#          3| 3.00#
-#         5#          3| 3.00#
-#         6#          5| 4.00#
-#==========#===========#=====#
-
+#============#===========#=====#
+#            #Case Number|Value#
+#============#===========#=====#
+#V1 Highest 1#         21|20.00#
+#           2#         20|19.00#
+#           3#         19|18.00#
+#           4#         19|18.00#
+#           5#         18|17.00#
+#           6#         17|16.00#
+#  ----------#-----------+-----#
+#    Lowest 1#          1| 1.00#
+#           2#          2| 2.00#
+#           3#          4| 3.00#
+#           4#          3| 3.00#
+#           5#          3| 3.00#
+#           6#          5| 4.00#
+#============#===========#=====#
 EOF
 if [ $? -ne 0 ] ; then fail ; fi