projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output: Fix vertical alignment of text to a baseline in chart output.
[pspp-builds.git]
/
tests
/
command
/
filter.sh
diff --git
a/tests/command/filter.sh
b/tests/command/filter.sh
index b6ab48f046e202f58522152443873e1c5e3fa6ea..ec76fba9f099c08157cd123ec647a01df6c8450d 100755
(executable)
--- a/
tests/command/filter.sh
+++ b/
tests/command/filter.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
}
@@
-78,13
+86,13
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp --testing-mode -o raw-ascii
$TESTFILE
+$SUPERVISOR $
PSPP --testing-mode
$TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="check results"
if [ $? -ne 0 ] ; then no_result ; fi
activity="check results"
-perl -pi -e
s/^\s*\$//g
$TEMPDIR/pspp.list
-diff -b $TEMPDIR/pspp.list - << EOF
| perl -e 's/^\s*$//g'
+perl -pi -e
's/^\s*$//g'
$TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - << EOF
X FILTER_$
-- --------
1 1.00
X FILTER_$
-- --------
1 1.00
@@
-92,7
+100,6
@@
diff -b $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
5 1.00
7 1.00
9 1.00
5 1.00
7 1.00
9 1.00
-
X FILTER_$
-- --------
1 1.00
X FILTER_$
-- --------
1 1.00
@@
-105,7
+112,6
@@
diff -b $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
8 .00
9 1.00
10 .00
8 .00
9 1.00
10 .00
-
X FILTER_$
-- --------
2 1.00
X FILTER_$
-- --------
2 1.00
@@
-113,7
+119,6
@@
diff -b $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
6 1.00
8 1.00
10 1.00
6 1.00
8 1.00
10 1.00
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi