projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bug 19581
[pspp-builds.git]
/
tests
/
command
/
use.sh
diff --git
a/tests/command/use.sh
b/tests/command/use.sh
index a685d3087f8f39619735a42bed85634e62d588d8..65532f44f5d0eb29dae08f3301445254b6317cde 100755
(executable)
--- a/
tests/command/use.sh
+++ b/
tests/command/use.sh
@@
-5,16
+5,22
@@
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`
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-48,7
+54,7
@@
cd $TEMPDIR
activity="create program"
cat > $TEMPDIR/filter.stat << EOF
activity="create program"
cat > $TEMPDIR/filter.stat << EOF
-data list notable /
x
1-2.
+data list notable /
X
1-2.
begin data.
1
2
begin data.
1
2
@@
-69,12
+75,13
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp
--testing-mode -o raw-ascii $TEMPDIR/filter.stat
+$SUPERVISOR $
PSPP -B $STAT_CONFIG_PATH
--testing-mode -o raw-ascii $TEMPDIR/filter.stat
if [ $? -ne 0 ] ; then no_result ; fi
activity="check results"
if [ $? -ne 0 ] ; then no_result ; fi
activity="check results"
-diff -B -b $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - << EOF
X
--
1
X
--
1