projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from branch interaction-review
[pspp-builds.git]
/
tests
/
bugs
/
match-files-scratch.sh
diff --git
a/tests/bugs/match-files-scratch.sh
b/tests/bugs/match-files-scratch.sh
index c36bc9ad3ed106018dc68833a8c59e368e1c81da..dd95c2c0772f9a404fb2e30a7dfd2d4bac5d8602 100755
(executable)
--- a/
tests/bugs/match-files-scratch.sh
+++ b/
tests/bugs/match-files-scratch.sh
@@
-7,10
+7,14
@@
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.pspp
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.pspp
-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
@@
-18,6
+22,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
}
@@
-70,13
+78,13
@@
FINISH.
EOF
if [ $? -ne 0 ] ; then no_result ; fi
EOF
if [ $? -ne 0 ] ; then no_result ; fi
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TESTFILE
+$SUPERVISOR $
PSPP --testing-mode
$TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
diff -b -w $TEMPDIR/pspp.list - << EOF
if [ $? -ne 0 ] ; then no_result ; fi
perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
diff -b -w $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST. Reading free-form data from
the command file
.
+1.1 DATA LIST. Reading free-form data from
INLINE
.
+--------+------+
|Variable|Format|
#========#======#
+--------+------+
|Variable|Format|
#========#======#