1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
From 07ad2a1905089b9124623324a9969e4522317110 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Fri, 12 Sep 2014 03:41:11 -0400
Subject: [PATCH] rsyslog: update configure to fix ptest
$MaxMessageSize doesn't work if before $IncludeConfig diag-common.conf, then
test cases fall into infinite loop with error message:
8062.511110729:4902c480: error: message received is larger than max msg size, we split it
8062.511152265:4902c480: discarding zero-sized message
Update configure to fix it.
Upstream-Status: Pending
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
tests/testsuites/complex1.conf | 2 +-
tests/testsuites/gzipwr_large.conf | 2 +-
tests/testsuites/gzipwr_large_dynfile.conf | 2 +-
tests/testsuites/imptcp_conndrop.conf | 2 +-
tests/testsuites/imptcp_large.conf | 2 +-
tests/testsuites/imtcp_conndrop.conf | 2 +-
tests/testsuites/wr_large.conf | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/testsuites/complex1.conf b/tests/testsuites/complex1.conf
index 9b6a9f3..e00caa4 100644
--- a/tests/testsuites/complex1.conf
+++ b/tests/testsuites/complex1.conf
@@ -1,7 +1,7 @@
# complex test case with multiple actions in gzip mode
# rgerhards, 2009-05-22
-$MaxMessageSize 10k
$IncludeConfig diag-common.conf
+$MaxMessageSize 10k
$MainMsgQueueTimeoutEnqueue 5000
diff --git a/tests/testsuites/gzipwr_large.conf b/tests/testsuites/gzipwr_large.conf
index 54ad3bb..e8247a9 100644
--- a/tests/testsuites/gzipwr_large.conf
+++ b/tests/testsuites/gzipwr_large.conf
@@ -1,7 +1,7 @@
# simple async writing test
# rgerhards, 2010-03-09
-$MaxMessageSize 10k
$IncludeConfig diag-common.conf
+$MaxMessageSize 10k
$ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000
diff --git a/tests/testsuites/gzipwr_large_dynfile.conf b/tests/testsuites/gzipwr_large_dynfile.conf
index 3a1b255..297cb70 100644
--- a/tests/testsuites/gzipwr_large_dynfile.conf
+++ b/tests/testsuites/gzipwr_large_dynfile.conf
@@ -1,7 +1,7 @@
# simple async writing test
# rgerhards, 2010-03-09
-$MaxMessageSize 10k
$IncludeConfig diag-common.conf
+$MaxMessageSize 10k
$ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000
diff --git a/tests/testsuites/imptcp_conndrop.conf b/tests/testsuites/imptcp_conndrop.conf
index 77a5d79..d9a14a8 100644
--- a/tests/testsuites/imptcp_conndrop.conf
+++ b/tests/testsuites/imptcp_conndrop.conf
@@ -1,7 +1,7 @@
# simple async writing test
# rgerhards, 2010-03-09
-$MaxMessageSize 10k
$IncludeConfig diag-common.conf
+$MaxMessageSize 10k
$ModLoad ../plugins/imptcp/.libs/imptcp
$MainMsgQueueTimeoutShutdown 10000
diff --git a/tests/testsuites/imptcp_large.conf b/tests/testsuites/imptcp_large.conf
index 77a5d79..d9a14a8 100644
--- a/tests/testsuites/imptcp_large.conf
+++ b/tests/testsuites/imptcp_large.conf
@@ -1,7 +1,7 @@
# simple async writing test
# rgerhards, 2010-03-09
-$MaxMessageSize 10k
$IncludeConfig diag-common.conf
+$MaxMessageSize 10k
$ModLoad ../plugins/imptcp/.libs/imptcp
$MainMsgQueueTimeoutShutdown 10000
diff --git a/tests/testsuites/imtcp_conndrop.conf b/tests/testsuites/imtcp_conndrop.conf
index de41bc4..7844dc7 100644
--- a/tests/testsuites/imtcp_conndrop.conf
+++ b/tests/testsuites/imtcp_conndrop.conf
@@ -1,7 +1,7 @@
# simple async writing test
# rgerhards, 2010-03-09
-$MaxMessageSize 10k
$IncludeConfig diag-common.conf
+$MaxMessageSize 10k
$ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000
diff --git a/tests/testsuites/wr_large.conf b/tests/testsuites/wr_large.conf
index b64f132..b0ae264 100644
--- a/tests/testsuites/wr_large.conf
+++ b/tests/testsuites/wr_large.conf
@@ -1,7 +1,7 @@
# simple async writing test
# rgerhards, 2010-03-09
-$MaxMessageSize 10k
$IncludeConfig diag-common.conf
+$MaxMessageSize 10k
$ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000
|
