diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 18:34:17 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 18:34:17 +0200 |
commit | d7c98e7a6ec28a6c76bccf16d83f36b34a705410 (patch) | |
tree | 66807ada649997bb6e5c8928a6a95870f43d926e /tests/testsuites | |
parent | c6a2dafb2fc5d186ef146035f270a4819075eab1 (diff) | |
parent | 8d8befaeca0d9ed3f096780e499a3231f16585c4 (diff) | |
download | rsyslog-d7c98e7a6ec28a6c76bccf16d83f36b34a705410.tar.gz rsyslog-d7c98e7a6ec28a6c76bccf16d83f36b34a705410.tar.xz rsyslog-d7c98e7a6ec28a6c76bccf16d83f36b34a705410.zip |
Merge branch 'beta' into master
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tests/testsuites')
-rw-r--r-- | tests/testsuites/invalid.conf | 3 | ||||
-rw-r--r-- | tests/testsuites/valid.conf | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/testsuites/invalid.conf b/tests/testsuites/invalid.conf new file mode 100644 index 00000000..8a865ba5 --- /dev/null +++ b/tests/testsuites/invalid.conf @@ -0,0 +1,3 @@ +# This is an invalid config file that shall trigger an exit code +# with the config verification run +$invalid diff --git a/tests/testsuites/valid.conf b/tests/testsuites/valid.conf new file mode 100644 index 00000000..250f0546 --- /dev/null +++ b/tests/testsuites/valid.conf @@ -0,0 +1,3 @@ +# This is an invalid config file that shall trigger an exit code +# with the config verification run +*.* /tmp/data.log |