projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FREQUENCIES: Move file-scope variables for stats into struct frq_proc.
[pspp]
/
tests
/
stats
/
descript-mean-bug.sh
diff --git
a/tests/stats/descript-mean-bug.sh
b/tests/stats/descript-mean-bug.sh
index 48ff213ba0a368606b5884b5530374faf6efbad8..4a8853b47e4109cccdc12531865371bf861e21a5 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,6
+58,8
@@
cd $TEMPDIR
activity="create program"
cat > $TEMPDIR/descript.stat <<EOF
activity="create program"
cat > $TEMPDIR/descript.stat <<EOF
+SET FORMAT F8.3.
+
data list notable / X 1.
begin data.
0
data list notable / X 1.
begin data.
0
@@
-65,17
+77,14
@@
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 -o pspp.csv
$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
-1.1 DESCRIPTIVES. Valid cases = 6; cases with missing value(s) = 0.
-+--------#-+-----+
-|Variable#N| Mean|
-#========#=#=====#
-|X #6|2.500|
-+--------#-+-----+
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: Valid cases = 6; cases with missing value(s) = 0.
+Variable,N,Mean
+X,6,2.500
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi