diff options
| author | Michael Biebl <biebl@debian.org> | 2012-11-21 17:23:23 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-11-21 17:23:23 +0100 |
| commit | 1796f8e02b6d0bc29ab65427d2ebf97f82f41999 (patch) | |
| tree | b095bd5faf13d6a48cc5ddc18891338931c5a273 /tests/testsuites | |
| parent | 792f31fe29bef0c9960d3951f266fc7b2c70a2fc (diff) | |
| download | rsyslog-1796f8e02b6d0bc29ab65427d2ebf97f82f41999.tar.gz | |
Imported Upstream version 7.2.3upstream/7.2.3
Diffstat (limited to 'tests/testsuites')
| -rw-r--r-- | tests/testsuites/imptcp_addtlframedelim.conf | 1 | ||||
| -rw-r--r-- | tests/testsuites/imptcp_conndrop.conf | 1 | ||||
| -rw-r--r-- | tests/testsuites/imptcp_large.conf | 1 | ||||
| -rw-r--r-- | tests/testsuites/imtcp_addtlframedelim.conf | 1 | ||||
| -rw-r--r-- | tests/testsuites/incltest_dir_empty_wildcard.conf | 11 |
5 files changed, 11 insertions, 4 deletions
diff --git a/tests/testsuites/imptcp_addtlframedelim.conf b/tests/testsuites/imptcp_addtlframedelim.conf index eb7ed0c..bf302fb 100644 --- a/tests/testsuites/imptcp_addtlframedelim.conf +++ b/tests/testsuites/imptcp_addtlframedelim.conf @@ -9,5 +9,4 @@ $template outfmt,"%msg:F,58:2%\n" $OMFileFlushOnTXEnd off $OMFileFlushInterval 2 $OMFileIOBufferSize 256k -$IncludeConfig rsyslog.action.1.include local0.* ./rsyslog.out.log;outfmt diff --git a/tests/testsuites/imptcp_conndrop.conf b/tests/testsuites/imptcp_conndrop.conf index 677e33f..77a5d79 100644 --- a/tests/testsuites/imptcp_conndrop.conf +++ b/tests/testsuites/imptcp_conndrop.conf @@ -12,5 +12,4 @@ $template dynfile,"rsyslog.out.log" # trick to use relative path names! $OMFileFlushOnTXEnd off $OMFileFlushInterval 2 $OMFileIOBufferSize 256k -$IncludeConfig rsyslog.action.1.include local0.* ?dynfile;outfmt diff --git a/tests/testsuites/imptcp_large.conf b/tests/testsuites/imptcp_large.conf index 677e33f..77a5d79 100644 --- a/tests/testsuites/imptcp_large.conf +++ b/tests/testsuites/imptcp_large.conf @@ -12,5 +12,4 @@ $template dynfile,"rsyslog.out.log" # trick to use relative path names! $OMFileFlushOnTXEnd off $OMFileFlushInterval 2 $OMFileIOBufferSize 256k -$IncludeConfig rsyslog.action.1.include local0.* ?dynfile;outfmt diff --git a/tests/testsuites/imtcp_addtlframedelim.conf b/tests/testsuites/imtcp_addtlframedelim.conf index 3b4759c..6558c51 100644 --- a/tests/testsuites/imtcp_addtlframedelim.conf +++ b/tests/testsuites/imtcp_addtlframedelim.conf @@ -9,5 +9,4 @@ $template outfmt,"%msg:F,58:2%\n" $OMFileFlushOnTXEnd off $OMFileFlushInterval 2 $OMFileIOBufferSize 256k -$IncludeConfig rsyslog.action.1.include local0.* ./rsyslog.out.log;outfmt diff --git a/tests/testsuites/incltest_dir_empty_wildcard.conf b/tests/testsuites/incltest_dir_empty_wildcard.conf new file mode 100644 index 0000000..5e750c5 --- /dev/null +++ b/tests/testsuites/incltest_dir_empty_wildcard.conf @@ -0,0 +1,11 @@ +# see .sh file for description +# rgerhards, 2009-11-30 +$IncludeConfig diag-common.conf + +# the following include leads to no files actually being included +# but MUST NOT abort rsyslog's startup sequence. No files matching +# the wildcard is valid (as long as the path exists)! +$IncludeConfig testsuites/incltest.d/*.conf-not-there + +$template outfmt,"%msg:F,58:2%\n" +:msg, contains, "msgnum:" ./rsyslog.out.log;outfmt |