diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-10 17:41:28 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-10 17:41:28 +0100 |
| commit | 200e2b66308fb0ca861b5ba72d2b408b7f24aac3 (patch) | |
| tree | 096885420457b9425fa8ccbbcdb1b005196a16a6 /tests/Makefile.am | |
| parent | 7a0c7c61a57730ead60b7d4982247b76febb3bd9 (diff) | |
| parent | c8ebe623376bc025bf166ec333ac874c215de816 (diff) | |
| download | rsyslog-200e2b66308fb0ca861b5ba72d2b408b7f24aac3.tar.gz rsyslog-200e2b66308fb0ca861b5ba72d2b408b7f24aac3.tar.xz rsyslog-200e2b66308fb0ca861b5ba72d2b408b7f24aac3.zip | |
Merge branch 'beta' into master
Conflicts:
ChangeLog
tests/parsertest.sh
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index a3f05068..e50c7b8c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -122,6 +122,10 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/reallife.parse1 \ testsuites/parse2.conf \ testsuites/reallife.parse2 \ + testsuites/parse3.conf \ + testsuites/reallife.parse3 \ + testsuites/parse_invld_regex.conf \ + testsuites/samples.parse_invld_regex \ testsuites/omod-if-array.conf \ testsuites/1.omod-if-array \ testsuites/1.field1 \ |