summaryrefslogtreecommitdiffstats
path: root/tests/testsuites
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-28 19:01:34 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-28 19:01:34 +0200
commit29cacc3c8ad6694b1ae2a5480fca7059773d06f0 (patch)
tree1c4996d03a90ddb4ad6ea236ee8f72194a13b99e /tests/testsuites
parentcbbf1586a204a897a050b6cb294b120e3ff5f23c (diff)
parentd7c98e7a6ec28a6c76bccf16d83f36b34a705410 (diff)
downloadrsyslog-29cacc3c8ad6694b1ae2a5480fca7059773d06f0.tar.gz
rsyslog-29cacc3c8ad6694b1ae2a5480fca7059773d06f0.tar.xz
rsyslog-29cacc3c8ad6694b1ae2a5480fca7059773d06f0.zip
Merge branch 'master' into v5-devel
Conflicts: tests/Makefile.am
Diffstat (limited to 'tests/testsuites')
-rw-r--r--tests/testsuites/invalid.conf3
-rw-r--r--tests/testsuites/valid.conf3
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