projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove write-only variable from interaction_case_data.
[pspp-builds.git]
/
tests
/
stats
/
ntiles.sh
diff --git
a/tests/stats/ntiles.sh
b/tests/stats/ntiles.sh
index 35d4af737deba3186d1aad520814c701b39254c5..dd00a361368128d3d02dbe834514a971b8c7a003 100755
(executable)
--- a/
tests/stats/ntiles.sh
+++ b/
tests/stats/ntiles.sh
@@
-4,18
+4,27
@@
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
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
rm -rf $TEMPDIR
- :
}
}
@@
-68,7
+77,7
@@
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="move output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="move output"
@@
-97,7
+106,7
@@
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"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"