projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed use of @dots in @math command.
[pspp-builds.git]
/
tests
/
command
/
sample.sh
diff --git
a/tests/command/sample.sh
b/tests/command/sample.sh
index 099df5f25b5898777e3b0a84c88b47250a1a6ef8..6ba6646bc1ae3d3e202142138ee765e77d7186d5 100755
(executable)
--- a/
tests/command/sample.sh
+++ b/
tests/command/sample.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
@@
-73,7
+77,7
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
--testing-mode $TEMPDIR/sample.stat
+$SUPERVISOR $
PSPP
--testing-mode $TEMPDIR/sample.stat
if [ $? -ne 0 ] ; then no_result ; fi
activity="create head"
if [ $? -ne 0 ] ; then no_result ; fi
activity="create head"
@@
-87,7
+91,7
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare head"
perl -pi -e 's/^\s*$//g' $TEMPDIR/head
activity="compare head"
perl -pi -e 's/^\s*$//g' $TEMPDIR/head
-diff -b $TEMPDIR/head - << EOF
|perl -e 's/^\s*$//g'
+diff -b $TEMPDIR/head - << EOF
A
--
EOF
A
--
EOF