summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--tests/Makefile.am1
-rwxr-xr-xtests/manytcp.sh4
3 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index dfb33339..58e1cfce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,5 +127,5 @@ SUBDIRS += tests
# temporarily be removed below. The intent behind forcing everthing to compile
# in a make distcheck is so that we detect code that accidently was not updated
# when some global update happened.
-DISTCHECK_CONFIGURE_FLAGS=--enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog --enable-diagtools --enable-gnutls --enable-omstdout --enable-oracle
+DISTCHECK_CONFIGURE_FLAGS=--enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog --enable-diagtools --enable-gnutls --enable-omstdout
ACLOCAL_AMFLAGS = -I m4
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