diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-12 13:21:46 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-12 13:21:46 +0100 |
| commit | 0fd8143d8719d08d9feb0a304bb352dd7c4bbab6 (patch) | |
| tree | b344fb400aabea95b2352ba13f51ae438a08d51a /tests/Makefile.am | |
| parent | 22bf4fc83274df41f9d490f522718f248e35c1f5 (diff) | |
| parent | 0a5b731f2f18168795bcdefd9b6fa562dce6a0d5 (diff) | |
| download | rsyslog-0fd8143d8719d08d9feb0a304bb352dd7c4bbab6.tar.gz rsyslog-0fd8143d8719d08d9feb0a304bb352dd7c4bbab6.tar.xz rsyslog-0fd8143d8719d08d9feb0a304bb352dd7c4bbab6.zip | |
Merge branch 'v4-stable' into v4-beta
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 1eed1408..a50ee8ee 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,6 +11,8 @@ TESTS = $(TESTRUNS) cfg.sh \ sndrcv_gzip.sh \ queue-persist.sh \ pipeaction.sh + execonlyonce.sh \ + queue-persist.sh if ENABLE_OMSTDOUT TESTS += omod-if-array.sh \ @@ -130,6 +132,9 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/master.rfctag \ testsuites/nolimittag.conf \ testsuites/master.nolimittag \ + execonlyonce.sh \ + testsuites/execonlyonce.conf \ + testsuites/execonlyonce.data \ DiagTalker.java \ cfg.sh |