projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove visibility from unused widgets and menus
[pspp-builds.git]
/
tests
/
bugs
/
temp-freq.sh
diff --git
a/tests/bugs/temp-freq.sh
b/tests/bugs/temp-freq.sh
index d2c1061432d5e815b9a70195ec7ee5109fb4354e..64f12ee9aa8f4836f43d0e0ef96e4467b5573211 100755
(executable)
--- a/
tests/bugs/temp-freq.sh
+++ b/
tests/bugs/temp-freq.sh
@@
-6,16
+6,25
@@
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`
+PSPP=$top_builddir/src/ui/terminal/pspp
# ensure that top_srcdir is absolute
# ensure that top_srcdir is absolute
-
cd $top_srcdir; top_srcdir=`
pwd`
+
top_srcdir=`cd $top_srcdir;
pwd`
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
+
+LANG=C
+export LANG
cleanup()
{
cleanup()
{
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-70,19
+79,19
@@
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 $
PSPP --testing-mode
$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:
+2.1 FREQUENCIES. X
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
|Value Label| Value |Frequency| Percent| Percent| Percent|
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
|Value Label| Value |Frequency| Percent| Percent| Percent|
@@
-94,7
+103,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|
@@
-103,7
+111,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