summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-02 11:23:27 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-02 11:23:27 +0200
commit97d94ad9afed4da801bdb3181b9895dccdb0cbfa (patch)
tree5eb523476be285f68edbaa4f9b43c02c95b1ddca
parentc7ccf7d322cd3a404f03609d74fb8184a7906707 (diff)
parentd855b1df7b8c4a11a9c6cc801526fafb9ce1aec6 (diff)
downloadrsyslog-97d94ad9afed4da801bdb3181b9895dccdb0cbfa.tar.gz
rsyslog-97d94ad9afed4da801bdb3181b9895dccdb0cbfa.tar.bz2
rsyslog-97d94ad9afed4da801bdb3181b9895dccdb0cbfa.zip
Merge branch 'v5-stable' into v6-stable
-rwxr-xr-xtests/complex1.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/complex1.sh b/tests/complex1.sh
index 56ff15d6..e138bff5 100755
--- a/tests/complex1.sh
+++ b/tests/complex1.sh
@@ -7,8 +7,8 @@ echo ===========================================================================
echo TEST: \[complex1.sh\]: complex test with gzip and multiple action queues
source $srcdir/diag.sh init
# uncomment for debugging support:
-export RSYSLOG_DEBUG="debug nostdout"
-export RSYSLOG_DEBUGLOG="log"
+#export RSYSLOG_DEBUG="debug nostdout"
+#export RSYSLOG_DEBUGLOG="log"
source $srcdir/diag.sh startup complex1.conf
# send 40,000 messages of 400 bytes plus header max, via three dest ports
source $srcdir/diag.sh tcpflood -m40000 -rd400 -P129 -f5 -n3 -c15 -i1