projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move GCC attribute declarations from pref.h.orig to new file
[pspp]
/
tests
/
bugs
/
temp-freq.sh
diff --git
a/tests/bugs/temp-freq.sh
b/tests/bugs/temp-freq.sh
index 63ac638de16cc8431e522a62258719a95cda292f..40b1c09d9820859245916ed06767a70c2e64cdbb 100755
(executable)
--- a/
tests/bugs/temp-freq.sh
+++ b/
tests/bugs/temp-freq.sh
@@
-6,10
+6,13
@@
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.sps
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
# 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
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
@@
-72,18
+75,18
@@
FINISH
EOF
if [ $? -ne 0 ] ; then no_result ; fi
EOF
if [ $? -ne 0 ] ; then no_result ; fi
-$SUPERVISOR $
here/..
/src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $
top_builddir
/src/pspp -o raw-ascii $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
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 |
+--------+------+
+--------+------+
|Variable|Format|
#========#======#
|SEX |A1 |
|X |F8.0 |
+--------+------+
-
2.1 FREQUENCIES. X:
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
2.1 FREQUENCIES. X:
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
@@
-96,7
+99,6
@@
diff -b -B -w $TEMPDIR/pspp.list - << EOF
#===========#========#=========#========#========#========#
| Total| 4| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 4| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-
+---------------+------+
|N Valid | 4|
| Missing| 0|
+---------------+------+
|N Valid | 4|
| Missing| 0|
@@
-105,7
+107,6
@@
diff -b -B -w $TEMPDIR/pspp.list - << EOF
|Minimum |12.000|
|Maximum |31.000|
+---------------+------+
|Minimum |12.000|
|Maximum |31.000|
+---------------+------+
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi