summaryrefslogtreecommitdiffstats
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-02-25 14:42:21 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-02-25 14:42:21 +0100
commit0995bff5947340333466cf3ac9c6a6b403b32d18 (patch)
tree0e19cbbd0f63005497b1dbe08779f2947b6eca22 /tests/Makefile.am
parentc8ebe623376bc025bf166ec333ac874c215de816 (diff)
parent76ded5e98bd51d5de306f21f8abd28ee3b006be2 (diff)
downloadrsyslog-0995bff5947340333466cf3ac9c6a6b403b32d18.tar.gz
rsyslog-0995bff5947340333466cf3ac9c6a6b403b32d18.tar.xz
rsyslog-0995bff5947340333466cf3ac9c6a6b403b32d18.zip
Merge branch 'v4-stable' into 'v5-beta'
Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cf8183a7..61fc808e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -100,6 +100,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/3.parse1 \
testsuites/4.parse1 \
testsuites/oversizeTag-1.parse1 \
+ testsuites/weird.parse1 \
testsuites/date1.parse1 \
testsuites/date2.parse1 \
testsuites/date3.parse1 \