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
/
percentiles-compatible.sh
diff --git
a/tests/stats/percentiles-compatible.sh
b/tests/stats/percentiles-compatible.sh
index 74afea475388e0950f25ca2f57673fb671a78840..d1e724d70f1289e4027c1bdd93d3e82a272f653d 100755
(executable)
--- a/
tests/stats/percentiles-compatible.sh
+++ b/
tests/stats/percentiles-compatible.sh
@@
-5,18
+5,30
@@
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
+
+LANG=C
+export LANG
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
rm -rf $TEMPDIR
- :
}
}
@@
-52,7
+64,7
@@
i=1;
activity="create program $i"
cat > $TEMPDIR/prog.sps <<EOF
activity="create program $i"
cat > $TEMPDIR/prog.sps <<EOF
-DATA LIST LIST notable /
x
* .
+DATA LIST LIST notable /
X
* .
BEGIN DATA.
1
2
BEGIN DATA.
1
2
@@
-70,12
+82,13
@@
EOF
if [ $? -ne 0 ] ; then no_result; fi
activity="run program $i"
if [ $? -ne 0 ] ; then no_result; fi
activity="run program $i"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TEMPDIR/prog.sps
+$SUPERVISOR $
PSPP --testing-mode
$TEMPDIR/prog.sps
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output $i"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output $i"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
-1.1 FREQUENCIES. X:
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - <<EOF
+1.1 FREQUENCIES. X
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
|Value Label| Value |Frequency| Percent| Percent| Percent|
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
|Value Label| Value |Frequency| Percent| Percent| Percent|
@@
-88,20
+101,19
@@
diff -B -b $TEMPDIR/pspp.list - <<EOF
#===========#========#=========#========#========#========#
| Total| 5| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 5| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-
-+-------------------+-----+
-|N Valid | 5|
-| Missing| 0|
-|Mean |3.000|
-|Std Dev |1.581|
-|Minimum |1.000|
-|Maximum |5.000|
-|Percentiles 0 |1.000|
-| 25 |1.500|
-| 50 |3.000|
-| 75 |4.500|
-| 100 |5.000|
-+-------------------+-----+
++-----------------------+-----+
+|N Valid | 5|
+| Missing | 0|
+|Mean |3.000|
+|Std Dev |1.581|
+|Minimum |1.000|
+|Maximum |5.000|
+|Percentiles 0 |1.000|
+| 25 |1.500|
+| 50 (Median)|3.000|
+| 75 |4.500|
+| 100 |5.000|
++-----------------------+-----+
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi