summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-04-26 15:55:51 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-04-26 15:55:51 +0200
commited7f89a49c6f820bc65f87514eb0effafcdeaacc (patch)
tree86ae5d3cddc18a0efa4330da85fafe8af331a29d /tests
parent59497bd057f6ee1bcb626d2ce30bf3eb8ef6ebd0 (diff)
parent149bab9cd1eb77c0708369d0a56903db90ab9d5f (diff)
downloadrsyslog-ed7f89a49c6f820bc65f87514eb0effafcdeaacc.tar.gz
rsyslog-ed7f89a49c6f820bc65f87514eb0effafcdeaacc.tar.xz
rsyslog-ed7f89a49c6f820bc65f87514eb0effafcdeaacc.zip
Merge branch 'v5-stable'
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am3
-rwxr-xr-xtests/pipe_noreader.sh9
2 files changed, 11 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 29a2ce14..32765ae4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,6 +34,7 @@ TESTS = $(TESTRUNS) cfg.sh \
complex1.sh \
queue-persist.sh \
pipeaction.sh \
+ pipe_noreader.sh \
execonlyonce.sh \
dircreate_dflt.sh \
dircreate_off.sh \
@@ -217,6 +218,8 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/sndrcv_gzip_rcvr.conf \
pipeaction.sh \
testsuites/pipeaction.conf \
+ pipe_noreader.sh \
+ testsuites/pipe_noreader.conf \
asynwr_simple.sh \
testsuites/asynwr_simple.conf \
asynwr_timeout.sh \
diff --git a/tests/pipe_noreader.sh b/tests/pipe_noreader.sh
index c80aaf3f..8dea0818 100755
--- a/tests/pipe_noreader.sh
+++ b/tests/pipe_noreader.sh
@@ -4,6 +4,12 @@
# as a permanent testcase. For some details, please see bug tracker
# http://bugzilla.adiscon.com/show_bug.cgi?id=186
#
+# IMPORTANT: we do NOT check any result message set. The whole point in
+# this test is to verify that we do NOT run into an eternal loop. As such,
+# the test is "PASS", if rsyslogd terminates. If it does not terminate, we
+# obviously do not cause "FAIL", but processing will hang, which should be
+# a good-enough indication of failure.
+#
# added 2010-04-26 by Rgerhards
# This file is part of the rsyslog project, released under GPLv3
echo ===============================================================================
@@ -18,5 +24,6 @@ source $srcdir/diag.sh startup pipe_noreader.conf
source $srcdir/diag.sh tcpflood -m1000 -d500
source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
source $srcdir/diag.sh wait-shutdown # and wait for it to terminate
-source $srcdir/diag.sh seq-check 0 999
+# NO need to check seqno -- see header comment
+echo we did not loop, so the test is sucessfull
source $srcdir/diag.sh exit