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
/
sort.sh
diff --git
a/tests/command/sort.sh
b/tests/command/sort.sh
index f51881a326133da0295af79b10146c7c055f9cfe..1eb4d855ae59560860cf5f0169d32a96bfe2271a 100755
(executable)
--- a/
tests/command/sort.sh
+++ b/
tests/command/sort.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
}
@@
-91,7
+97,7
@@
for count_repeat_buffers in \
repeat=$2
buffers=$3
repeat=$2
buffers=$3
-
echo -n
.
+
printf
.
activity="generate data for $count_repeat_buffers run"
$PERL gen-data.pl $count $repeat > sort.data
activity="generate data for $count_repeat_buffers run"
$PERL gen-data.pl $count $repeat > sort.data
@@
-110,10
+116,11
@@
for count_repeat_buffers in \
} > sort.pspp || no_result
activity="run program"
} > sort.pspp || no_result
activity="run program"
- $SUPERVISOR $
here/../src/pspp
--testing-mode -o raw-ascii sort.pspp
+ $SUPERVISOR $
PSPP
--testing-mode -o raw-ascii sort.pspp
if [ $? -ne 0 ] ; then no_result ; fi
if [ $? -ne 0 ] ; then no_result ; fi
-
- diff -B -w sort.exp sort.out
+
+ perl -pi -e 's/^\s*$//g' sort.exp sort.out
+ diff -w sort.exp sort.out
if [ $? -ne 0 ] ; then fail ; fi
done
echo
if [ $? -ne 0 ] ; then fail ; fi
done
echo