diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-10 16:35:12 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-10 16:35:12 +0100 |
| commit | c8ebe623376bc025bf166ec333ac874c215de816 (patch) | |
| tree | 2e1c6f6a149bce3844ed21da08e5f0695de3fecc /tests/Makefile.am | |
| parent | 497bfeb287a75d1fb0f37502d3805307311a574d (diff) | |
| parent | 76b3f2cd875dca755f4beee8dbf525c23d9730cf (diff) | |
| download | rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.tar.gz rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.tar.xz rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.zip | |
Merge branch 'v4-beta' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imuxsock/imuxsock.c
template.c
tests/Makefile.am
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 716207e1..cf8183a7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -114,6 +114,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 \ |