projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
[pspp-builds.git]
/
tests
/
stats
/
descript-mean-bug.sh
diff --git
a/tests/stats/descript-mean-bug.sh
b/tests/stats/descript-mean-bug.sh
index d1ebd648739747f08a2d9f915d8287d5fc5188df..eb12331b9308ca30e67bf4deb534f0969f3c6ba2 100755
(executable)
--- a/
tests/stats/descript-mean-bug.sh
+++ b/
tests/stats/descript-mean-bug.sh
@@
-5,16
+5,26
@@
TEMPDIR=/tmp/pspp-tst-$$
TEMPDIR=/tmp/pspp-tst-$$
-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
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-48,7
+58,9
@@
cd $TEMPDIR
activity="create program"
cat > $TEMPDIR/descript.stat <<EOF
activity="create program"
cat > $TEMPDIR/descript.stat <<EOF
-data list notable / x 1.
+SET FORMAT F8.3.
+
+data list notable / X 1.
begin data.
0
1
begin data.
0
1
@@
-65,11
+77,12
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TEMPDIR/descript.stat
+$SUPERVISOR $
PSPP --testing-mode
$TEMPDIR/descript.stat
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - <<EOF
1.1 DESCRIPTIVES. Valid cases = 6; cases with missing value(s) = 0.
+--------#-+-----+
|Variable#N| Mean|
1.1 DESCRIPTIVES. Valid cases = 6; cases with missing value(s) = 0.
+--------#-+-----+
|Variable#N| Mean|