projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix change log.
[pspp]
/
tests
/
stats
/
percentiles-enhanced.sh
diff --git
a/tests/stats/percentiles-enhanced.sh
b/tests/stats/percentiles-enhanced.sh
index 13b24c29913f9dfcaf994a2a08e5c62a17fb2858..4a2c167e2eda2a1b088370b006b38e42482c2dec 100755
(executable)
--- a/
tests/stats/percentiles-enhanced.sh
+++ b/
tests/stats/percentiles-enhanced.sh
@@
-5,10
+5,14
@@
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
@@
-16,6
+20,7
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ cd /
rm -rf $TEMPDIR
:
}
rm -rf $TEMPDIR
:
}
@@
-70,11
+75,12
@@
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
-o raw-ascii $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
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - <<EOF
1.1 FREQUENCIES. X:
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
1.1 FREQUENCIES. X:
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
@@
-88,7
+94,6
@@
diff -B -b $TEMPDIR/pspp.list - <<EOF
#===========#========#=========#========#========#========#
| Total| 5| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 5| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-
+-------------------+-----+
|N Valid | 5|
| Missing| 0|
+-------------------+-----+
|N Valid | 5|
| Missing| 0|
@@
-133,11
+138,12
@@
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
-o raw-ascii $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
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - <<EOF
1.1 FREQUENCIES. X:
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
1.1 FREQUENCIES. X:
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
@@
-151,7
+157,6
@@
diff -B -b $TEMPDIR/pspp.list - <<EOF
#===========#========#=========#========#========#========#
| Total| 10| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 10| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-
+-------------------+-----+
|N Valid | 10|
| Missing| 0|
+-------------------+-----+
|N Valid | 10|
| Missing| 0|
@@
-194,11
+199,12
@@
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
-o raw-ascii $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
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - <<EOF
1.1 FREQUENCIES. X:
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
1.1 FREQUENCIES. X:
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
@@
-211,7
+217,6
@@
diff -B -b $TEMPDIR/pspp.list - <<EOF
#===========#========#=========#========#========#========#
| Total| 6| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 6| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-
+-------------------+-----+
|N Valid | 6|
| Missing| 0|
+-------------------+-----+
|N Valid | 6|
| Missing| 0|
@@
-254,11
+259,12
@@
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
-o raw-ascii $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
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - <<EOF
1.1 FREQUENCIES. X:
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
1.1 FREQUENCIES. X:
+-----------+--------+---------+--------+--------+--------+
| | | | | Valid | Cum |
@@
-272,7
+278,6
@@
diff -B -b $TEMPDIR/pspp.list - <<EOF
#===========#========#=========#========#========#========#
| Total| 10| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 10| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-
+-------------------+-----+
|N Valid | 6|
| Missing| 4|
+-------------------+-----+
|N Valid | 6|
| Missing| 4|