summaryrefslogtreecommitdiffstats
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-11-05 14:34:21 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-11-05 14:34:21 +0100
commit4578dc6a2dc65112f4aaae1524f83cc9b075295d (patch)
tree7f86aaf79a9b4a77bfb297336b25f1f61007db72 /tests/Makefile.am
parent6d9c54c7a2d4f07b0414082ef9681bd197ed6bde (diff)
parentcd5f653ad8fa87727bf3ab12b90a41babaaf1ee5 (diff)
downloadrsyslog-4578dc6a2dc65112f4aaae1524f83cc9b075295d.tar.gz
rsyslog-4578dc6a2dc65112f4aaae1524f83cc9b075295d.tar.xz
rsyslog-4578dc6a2dc65112f4aaae1524f83cc9b075295d.zip
Merge branch 'v4-devel' into tmp
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 918dbdd5..28d51b40 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,7 +13,8 @@ TESTS = $(TESTRUNS) cfg.sh \
rulesetmultiqueue.sh \
manytcp.sh \
rsf_getenv.sh \
- queue-persist.sh
+ queue-persist.sh \
+ pipeaction.sh
if ENABLE_OMSTDOUT
TESTS += omod-if-array.sh \
@@ -143,6 +144,8 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/threadingmq.conf \
threadingmqaq.sh \
testsuites/threadingmqaq.conf \
+ pipeaction.sh \
+ testsuites/pipeaction.conf \
proprepltest.sh \
testsuites/rfctag.conf \
testsuites/master.rfctag \