projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't destroy dictionary on error if we didn't create it.
[pspp]
/
tests
/
stats
/
percentiles-enhanced.sh
diff --git
a/tests/stats/percentiles-enhanced.sh
b/tests/stats/percentiles-enhanced.sh
index 87c4b069fca877bc5cc37266f13a73c6b3dfc19c..f818f820b48e35b6f1d04cbe6b03a5dc13817688 100755
(executable)
--- a/
tests/stats/percentiles-enhanced.sh
+++ b/
tests/stats/percentiles-enhanced.sh
@@
-5,20
+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`
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
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
cd /
rm -rf $TEMPDIR
- :
}
}
@@
-71,13
+81,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"
-perl -pi -e
s/^\s*\$//g
$TEMPDIR/pspp.list
-diff -b $TEMPDIR/pspp.list - <<EOF
| perl -e 's/^\s*$//g'
-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|
@@
-90,20
+100,19
@@
diff -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
#===========#========#=========#========#========#========#
| 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 |2.000|
-| 50 |3.000|
-| 75 |4.000|
-| 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 |2.000|
+| 50 (Median)|3.000|
+| 75 |4.000|
+| 100 |5.000|
++-----------------------+-----+
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi
@@
-135,13
+144,13
@@
if [ $? -ne 0 ] ; then no_result; fi
activity="run program $i"
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"
-perl -pi -e
s/^\s*\$//g
$TEMPDIR/pspp.list
-diff -b $TEMPDIR/pspp.list - <<EOF
| perl -e 's/^\s*$//g'
-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|
@@
-154,20
+163,19
@@
diff -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
#===========#========#=========#========#========#========#
| Total| 10| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 10| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-
-+-------------------+-----+
-|N Valid | 10|
-| Missing| 0|
-|Mean |3.000|
-|Std Dev |1.491|
-|Minimum |1.000|
-|Maximum |5.000|
-|Percentiles 0 |1.000|
-| 25 |2.000|
-| 50 |3.000|
-| 75 |4.000|
-| 100 |5.000|
-+-------------------+-----+
++-----------------------+-----+
+|N Valid | 10|
+| Missing | 0|
+|Mean |3.000|
+|Std Dev |1.491|
+|Minimum |1.000|
+|Maximum |5.000|
+|Percentiles 0 |1.000|
+| 25 |2.000|
+| 50 (Median)|3.000|
+| 75 |4.000|
+| 100 |5.000|
++-----------------------+-----+
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi
@@
-197,13
+205,13
@@
if [ $? -ne 0 ] ; then no_result; fi
activity="run program $i"
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"
-perl -pi -e
s/^\s*\$//g
$TEMPDIR/pspp.list
-diff -b $TEMPDIR/pspp.list - <<EOF
| perl -e 's/^\s*$//g'
-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|
@@
-215,20
+223,19
@@
diff -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
#===========#========#=========#========#========#========#
| Total| 6| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 6| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-
-+-------------------+-----+
-|N Valid | 6|
-| Missing| 0|
-|Mean |3.500|
-|Std Dev |1.517|
-|Minimum |1.000|
-|Maximum |5.000|
-|Percentiles 0 |1.000|
-| 25 |3.000|
-| 50 |3.500|
-| 75 |4.750|
-| 100 |5.000|
-+-------------------+-----+
++-----------------------+-----+
+|N Valid | 6|
+| Missing | 0|
+|Mean |3.500|
+|Std Dev |1.517|
+|Minimum |1.000|
+|Maximum |5.000|
+|Percentiles 0 |1.000|
+| 25 |3.000|
+| 50 (Median)|3.500|
+| 75 |4.750|
+| 100 |5.000|
++-----------------------+-----+
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi
@@
-258,13
+265,13
@@
if [ $? -ne 0 ] ; then no_result; fi
activity="run program $i"
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"
-perl -pi -e
s/^\s*\$//g
$TEMPDIR/pspp.list
-diff
-b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
-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|
@@
-277,20
+284,19
@@
diff -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
#===========#========#=========#========#========#========#
| Total| 10| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 10| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-
-+-------------------+-----+
-|N Valid | 6|
-| Missing| 4|
-|Mean |3.500|
-|Std Dev |1.517|
-|Minimum |1.000|
-|Maximum |5.000|
-|Percentiles 0 |1.000|
-| 25 |3.000|
-| 50 |3.500|
-| 75 |4.750|
-| 100 |5.000|
-+-------------------+-----+
++-----------------------+-----+
+|N Valid | 6|
+| Missing | 4|
+|Mean |3.500|
+|Std Dev |1.517|
+|Minimum |1.000|
+|Maximum |5.000|
+|Percentiles 0 |1.000|
+| 25 |3.000|
+| 50 (Median)|3.500|
+| 75 |4.750|
+| 100 |5.000|
++-----------------------+-----+
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi