projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added new files resulting from directory restructuring.
[pspp]
/
tests
/
stats
/
percentiles-enhanced.sh
diff --git
a/tests/stats/percentiles-enhanced.sh
b/tests/stats/percentiles-enhanced.sh
index 13b24c29913f9dfcaf994a2a08e5c62a17fb2858..f7033d07c640b9065ac08d63b0916536d74376ce 100755
(executable)
--- a/
tests/stats/percentiles-enhanced.sh
+++ b/
tests/stats/percentiles-enhanced.sh
@@
-5,10
+5,13
@@
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`
# 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
+19,7
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ cd /
rm -rf $TEMPDIR
:
}
rm -rf $TEMPDIR
:
}
@@
-70,11
+74,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 $
top_builddir
/src/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
+93,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
+137,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 $
top_builddir
/src/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
+156,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
+198,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 $
top_builddir
/src/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
+216,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
+258,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 $
top_builddir
/src/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
+277,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|