Checkin of new directory structure.

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

diff --git a/tests/command/examine-extremes.sh b/tests/command/examine-extremes.sh
index b10fdbca5afc0fa8821f0f296eb4da4e896dc4bd..9c2dfb6051586a807d450b973aac3bfc15e94e81 100755 (executable)
--- a/tests/command/examine-extremes.sh
+++ b/tests/command/examine-extremes.sh
@@ -5,10 +5,13 @@
 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`
 
 # 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 +88,12 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $top_builddir/src/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,7 +104,6 @@ diff -b -B $TEMPDIR/pspp.list - << EOF
 #==#==#=======#=#=======#==#=======#
 #V1#23|   100%|0|     0%|23|   100%#
 #==#==#=======#=#=======#==#=======#
-
 1.2 EXAMINE.  Extreme Values
 #==========#===========#=====#
 #          #Case Number|Value#
@@ -119,7 +122,6 @@ diff -b -B $TEMPDIR/pspp.list - << EOF
 #         5#          3| 3.00#
 #         6#          5| 4.00#
 #==========#===========#=====#
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi