Fixed blank replacement

[pspp-builds.git] / tests / bugs / crosstabs-crash.sh

diff --git a/tests/bugs/crosstabs-crash.sh b/tests/bugs/crosstabs-crash.sh
index db301560f90015ac6b6297dc25aa5785fddf4101..e50ed5f7ce6108760f7077443f04edbec64dfea0 100755 (executable)
--- a/tests/bugs/crosstabs-crash.sh
+++ b/tests/bugs/crosstabs-crash.sh
@@ -11,11 +11,13 @@ here=`pwd`;
 # ensure that top_srcdir is absolute
 cd $top_srcdir; 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
 }
 
@@ -62,7 +64,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -72,7 +75,6 @@ diff -b -B -w $TEMPDIR/pspp.list - << EOF
 |X       |F8.0  |
 |Y       |F8.0  |
 +--------+------+
-
 2.1 CROSSTABS.  Summary.
 #===============#=====================================================#
 #               #                        Cases                        #
@@ -83,7 +85,6 @@ diff -b -B -w $TEMPDIR/pspp.list - << EOF
 #---------------#--------+--------+--------+--------+--------+--------#
 #X * Y          #       1|  100.0%|       0|    0.0%|       1|  100.0%#
 #===============#========#========#========#========#========#========#
-
 2.2 CROSSTABS.  X by Y [count].
 #===============#==============================================================#========#
 #               #                               Y                              |        #
@@ -99,7 +100,6 @@ diff -b -B -w $TEMPDIR/pspp.list - << EOF
 #           7.00#      .0|      .0|      .0|      .0|      .0|      .0|      .0|      .0#
 #Total          #     .0%|     .0%|     .0%|     .0%|    1.0%|     .0%|     .0%|    1.0%#
 #===============#========#========#========#========#========#========#========#========#
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi