summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-09 18:51:21 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-09 18:51:21 +0200
commite07b3f380f87166ce055ac4f3253f0367ef5cdce (patch)
treef0f9674ea8b2ae0d43f2efc09ea9495e4121fb1c /tests
parent1e52abd8be2dfde8727c7e54b02a10ce5051815f (diff)
downloadrsyslog-e07b3f380f87166ce055ac4f3253f0367ef5cdce.tar.gz
rsyslog-e07b3f380f87166ce055ac4f3253f0367ef5cdce.tar.xz
rsyslog-e07b3f380f87166ce055ac4f3253f0367ef5cdce.zip
working some more on "make distcheck"
... this time I think successfully (at least on Fedora...)
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am1
-rwxr-xr-xtests/manytcp.sh4
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 53a81a93..6d3c8725 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,6 +28,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/1.omod-if-array \
parsertest.sh \
manytcp.sh \
+ testsuites/manytcp.conf \
omod-if-array.sh \
cfg.sh
diff --git a/tests/manytcp.sh b/tests/manytcp.sh
index 3accfb8a..b38245df 100755
--- a/tests/manytcp.sh
+++ b/tests/manytcp.sh
@@ -1,5 +1,5 @@
rm -f rsyslog.out.log # work file
-../tools/rsyslogd -c4 -u2 -n -irsyslog.pid -M../runtime/.libs:../.libs -ftestsuites/manytcp.conf &
+../tools/rsyslogd -c4 -u2 -n -irsyslog.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/manytcp.conf &
echo "rsyslogd started with pid " `cat rsyslog.pid`
./tcpflood 127.0.0.1 13514 1000 20000
sleep 1
@@ -8,6 +8,8 @@ rm -f work
sort < rsyslog.out.log > work
./chkseq work 0 19999
if [ "$?" -ne "0" ]; then
+ rm -f work rsyslog.out.log
echo "sequence error detected"
exit 1
fi
+rm -f work rsyslog.out.log