diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-15 11:57:53 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-15 11:57:53 +0200 |
commit | 73f83d963bc8084a3efc186a383493cbcbc7886e (patch) | |
tree | 71ba4f9804f3d81a25f8ec2e58ae2389fa1112c5 /tests/Makefile.am | |
parent | c5408da3d8f17691fb91282d031757ed041fec55 (diff) | |
parent | 11c3b7d9e4198396dbe0bfa0308d80901072c673 (diff) | |
download | rsyslog-73f83d963bc8084a3efc186a383493cbcbc7886e.tar.gz rsyslog-73f83d963bc8084a3efc186a383493cbcbc7886e.tar.xz rsyslog-73f83d963bc8084a3efc186a383493cbcbc7886e.zip |
Merge branch 'master' into newqueue
Conflicts:
tools/syslogd.c
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r-- | tests/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c31e9eaa..cdf2c4be 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -90,6 +90,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/rfc5424-2.parse1 \ testsuites/rfc5424-3.parse1 \ testsuites/rfc5424-4.parse1 \ + testsuites/malformed.parse1 \ testsuites/omod-if-array.conf \ testsuites/1.omod-if-array \ testsuites/1.field1 \ |