Move global initialization and cleanup code into main.c.

[pspp] / tests / bugs / temp-freq.sh

diff --git a/tests/bugs/temp-freq.sh b/tests/bugs/temp-freq.sh
index 537c5e0b509db2e44fb1edbede69d63a3de5e0e6..4774193166ce529e4370620085ea276765ce268f 100755 (executable)
--- a/tests/bugs/temp-freq.sh
+++ b/tests/bugs/temp-freq.sh
@@ -17,6 +17,7 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -74,7 +75,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 $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|
@@ -82,7 +84,6 @@ diff -b -B -w $TEMPDIR/pspp.list - << EOF
 |SEX     |A1    |
 |X       |F8.0  |
 +--------+------+
-
 2.1 FREQUENCIES.  X: 
 +-----------+--------+---------+--------+--------+--------+
 |           |        |         |        |  Valid |   Cum  |
@@ -95,7 +96,6 @@ diff -b -B -w $TEMPDIR/pspp.list - << EOF
 #===========#========#=========#========#========#========#
 |               Total|        4|   100.0|   100.0|        |
 +--------------------+---------+--------+--------+--------+
-
 +---------------+------+
 |N       Valid  |     4|
 |        Missing|     0|
@@ -104,7 +104,6 @@ diff -b -B -w $TEMPDIR/pspp.list - << EOF
 |Minimum        |12.000|
 |Maximum        |31.000|
 +---------------+------+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi