diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-05 14:34:08 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-05 14:34:08 +0100 |
| commit | cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5 (patch) | |
| tree | 4e98efffdf24157afe8601a8c381dcc56a0ad354 /tests/Makefile.am | |
| parent | e4ca8a3119ece504819605b340a3f5ba36b3eab6 (diff) | |
| parent | 6a99be469643ef0214729391f9cef4867b8e9fca (diff) | |
| download | rsyslog-cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5.tar.gz rsyslog-cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5.tar.xz rsyslog-cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5.zip | |
Merge branch 'v4-beta' into v4-devel
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 33f94eef..d91df77b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,7 +8,8 @@ TESTS = $(TESTRUNS) cfg.sh \ diskqueue-fsync.sh \ manytcp.sh \ rsf_getenv.sh \ - queue-persist.sh + queue-persist.sh \ + pipeaction.sh if ENABLE_OMSTDOUT TESTS += omod-if-array.sh \ @@ -116,6 +117,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 \ |