projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo which cause the binary not to depend upon any libraries
[pspp]
/
tests
/
command
/
sysfiles.sh
diff --git
a/tests/command/sysfiles.sh
b/tests/command/sysfiles.sh
index 48f561bc795ece3b881e9c85343e2a78d75c2a8f..7e0dcafcaf9ce950133aa62ecfd0437283bb3fc8 100755
(executable)
--- a/
tests/command/sysfiles.sh
+++ b/
tests/command/sysfiles.sh
@@
-7,10
+7,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
@@
-75,11
+79,12
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp
-o raw-ascii $TESTFILE
+$SUPERVISOR $
PSPP
-o raw-ascii $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b -w $TEMPDIR/pspp.list - << EOF
variable001 variable002 variable003 variable004
----------- ----------- ----------- -----------
1.00 1.00 1.00 2.00
variable001 variable002 variable003 variable004
----------- ----------- ----------- -----------
1.00 1.00 1.00 2.00
@@
-90,7
+95,6
@@
variable001 variable002 variable003 variable004
2.00 1.00 2.00 22.00
2.00 2.00 1.00 1.00
2.00 2.00 2.00 3.00
2.00 1.00 2.00 22.00
2.00 2.00 1.00 1.00
2.00 2.00 2.00 3.00
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi