summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-11-13 10:58:43 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-11-13 10:58:43 +0100
commitc051786ea6318f9a9a5e531c49512e4ae19f249b (patch)
tree9b4c8781cc249398360ce63847039315310cc0a0
parentc5be3764a164ba8a889316261b49f38ca4a26da0 (diff)
downloadrsyslog-c051786ea6318f9a9a5e531c49512e4ae19f249b.tar.gz
rsyslog-c051786ea6318f9a9a5e531c49512e4ae19f249b.tar.xz
rsyslog-c051786ea6318f9a9a5e531c49512e4ae19f249b.zip
solved some minor nits in make distcheckv5.3.5
-rw-r--r--doc/Makefile.am2
-rw-r--r--tests/Makefile.am1
-rwxr-xr-xtests/sndrcv_drvr.sh1
3 files changed, 3 insertions, 1 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4832e757..661e9c57 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -92,7 +92,7 @@ html_files = \
rsconf1_resetconfigvariables.html \
rsconf1_rulesetcreatemainqueue.html \
rsconf1_umask.html \
- rulesetparser.html \
+ rsconf1_rulesetparser.html \
v3compatibility.html \
v4compatibility.html \
v5compatibility.html \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 62de7f28..716207e1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -146,6 +146,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/discard.conf \
diag.sh \
testsuites/diag-common.conf \
+ testsuites/diag-common2.conf \
daqueue-persist.sh \
daqueue-persist-drvr.sh \
queue-persist.sh \
diff --git a/tests/sndrcv_drvr.sh b/tests/sndrcv_drvr.sh
index 9835a8eb..e154b70a 100755
--- a/tests/sndrcv_drvr.sh
+++ b/tests/sndrcv_drvr.sh
@@ -35,6 +35,7 @@ source $srcdir/diag.sh wait-startup 2
# now inject the messages into instance 2. It will connect to instance 1,
# and that instance will record the data.
source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 $2 1
+sleep 2 # ensure all messages reach the input module
# shut down sender when everything is sent, receiver continues to run concurrently
# may be needed by TLS (once we do it): sleep 60
source $srcdir/diag.sh shutdown-when-empty 2