summaryrefslogtreecommitdiffstats
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-06-26 14:09:15 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-06-26 14:09:15 +0200
commitd22f240bc3525f7e112ce44aea6b9f87f8a51c8a (patch)
tree338334b847fdf1a199a55bdf73d9a1dad02498ed /tests/Makefile.am
parentc7b309a662a4310a8b878c036d9440e0b2e345a8 (diff)
parent6be06d50e328c4b8c79b263e176e6b4e384a03f9 (diff)
downloadrsyslog-d22f240bc3525f7e112ce44aea6b9f87f8a51c8a.tar.gz
rsyslog-d22f240bc3525f7e112ce44aea6b9f87f8a51c8a.tar.xz
rsyslog-d22f240bc3525f7e112ce44aea6b9f87f8a51c8a.zip
Merge branch 'master' into v5-devel
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f6bb0587..cbbca074 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,6 +18,8 @@ TESTS += omod-if-array.sh \
parsertest.sh \
timestamp.sh \
inputname.sh \
+ threadingmq.sh \
+ threadingmqaq.sh \
fieldtest.sh
endif
@@ -116,6 +118,10 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
queue-persist.sh \
queue-persist-drvr.sh \
testsuites/queue-persist.conf \
+ threadingmq.sh \
+ testsuites/threadingmq.conf \
+ threadingmqaq.sh \
+ testsuites/threadingmqaq.conf \
DiagTalker.java \
cfg.sh