First step in making struct variable opaque: the boring mechanical

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

diff --git a/tests/bugs/temp-freq.sh b/tests/bugs/temp-freq.sh
index 63ac638de16cc8431e522a62258719a95cda292f..7ec3c012a49f21dd32f58730b5100f73816f9b3a 100755 (executable)
--- a/tests/bugs/temp-freq.sh
+++ b/tests/bugs/temp-freq.sh
@@ -6,14 +6,21 @@
 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
 
+LANG=C
+export LANG
+
 
 cleanup()
 {
@@ -72,19 +79,19 @@ FINISH
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-diff -b -B -w $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  -w $TEMPDIR/pspp.list - << EOF
+1.1 DATA LIST.  Reading free-form data from INLINE.
 +--------+------+
 |Variable|Format|
 #========#======#
 |SEX     |A1    |
 |X       |F8.0  |
 +--------+------+
-
-2.1 FREQUENCIES.  X: 
+2.1 FREQUENCIES.  X 
 +-----------+--------+---------+--------+--------+--------+
 |           |        |         |        |  Valid |   Cum  |
 |Value Label|  Value |Frequency| Percent| Percent| Percent|
@@ -96,7 +103,6 @@ diff -b -B -w $TEMPDIR/pspp.list - << EOF
 #===========#========#=========#========#========#========#
 |               Total|        4|   100.0|   100.0|        |
 +--------------------+---------+--------+--------+--------+
-
 +---------------+------+
 |N       Valid  |     4|
 |        Missing|     0|
@@ -105,7 +111,6 @@ diff -b -B -w $TEMPDIR/pspp.list - << EOF
 |Minimum        |12.000|
 |Maximum        |31.000|
 +---------------+------+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi