projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master'; commit 'savannah/master'
[pspp-builds.git]
/
tests
/
command
/
t-test-pairs.sh
diff --git
a/tests/command/t-test-pairs.sh
b/tests/command/t-test-pairs.sh
index dd2d14ae00546d89e986f47b896af1b5a0316d68..25946236121aa271a76e6bcbe62b9b1a60a313ac 100755
(executable)
--- a/
tests/command/t-test-pairs.sh
+++ b/
tests/command/t-test-pairs.sh
@@
-5,10
+5,14
@@
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.sps
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.sps
-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,10
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
cd /
rm -rf $TEMPDIR
}
cd /
rm -rf $TEMPDIR
}
@@
-65,7
+73,7
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TESTFILE
+$SUPERVISOR $
PSPP --testing-mode
$TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
@@
-96,7
+104,7
@@
diff -b $TEMPDIR/pspp.list - <<EOF
#===========#=====================================================#======#==#===============#
# # Paired Differences | | | #
# #-------+--------------+---------------+--------------+ | | #
#===========#=====================================================#======#==#===============#
# # Paired Differences | | | #
# #-------+--------------+---------------+--------------+ | | #
-# # | | |
95%
| | | #
+# # | | |
95% Confidence
| | | #
# # | | +-------+------+ | | #
# # Mean |Std. Deviation|Std. Error Mean| Lower | Upper| t |df|Sig. (2-tailed)#
#===========#=======#==============#===============#=======#======#======#==#===============#
# # | | +-------+------+ | | #
# # Mean |Std. Deviation|Std. Error Mean| Lower | Upper| t |df|Sig. (2-tailed)#
#===========#=======#==============#===============#=======#======#======#==#===============#