diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-16 13:59:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-16 13:59:09 +0200 |
| commit | b5f3387357ffa11e238ddfe0fa38af4fffba6081 (patch) | |
| tree | 80447feb5aac91ca4d515ae373167efca4dea9ca /tests/Makefile.am | |
| parent | cf1289737659a8a807419b51566613c9fb776005 (diff) | |
| parent | aef1a38fe8c7472362904b2f90c67113b21034ab (diff) | |
| download | rsyslog-b5f3387357ffa11e238ddfe0fa38af4fffba6081.tar.gz rsyslog-b5f3387357ffa11e238ddfe0fa38af4fffba6081.tar.xz rsyslog-b5f3387357ffa11e238ddfe0fa38af4fffba6081.zip | |
Merge branch 'omfile' into v5-devel
Note that this was NOT a trivial merge, and there may be
some issues. This needs to be seen when we continue developing.
Conflicts:
runtime/msg.h
runtime/obj.h
runtime/queue.c
runtime/srUtils.h
runtime/stream.c
runtime/stream.h
runtime/wti.c
tests/Makefile.am
tools/omfile.c
tools/syslogd.c
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index e22b429c..fe0ec4bb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,9 +7,11 @@ TESTS = $(TESTRUNS) cfg.sh \ da-mainmsg-q.sh \ validation-run.sh \ imtcp-multiport.sh \ - diskqueue.sh manytcp.sh \ - queue-persist.sh \ - daqueue-persist.sh + daqueue-persist.sh \ + diskqueue.sh \ + diskqueue-fsync.sh \ + manytcp.sh \ + queue-persist.sh if ENABLE_OMSTDOUT TESTS += omod-if-array.sh parsertest.sh inputname.sh fieldtest.sh @@ -68,6 +70,8 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/linkedlistqueue.conf \ da-mainmsg-q.sh \ testsuites/da-mainmsg-q.conf \ + diskqueue-fsync.sh \ + testsuites/diskqueue-fsync.conf \ imtcp-multiport.sh \ testsuites/imtcp-multiport.conf \ manytcp.sh \ @@ -79,8 +83,6 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/1.inputname_imtcp_12516 \ omod-if-array.sh \ diag.sh \ - daqueue-persist.sh \ - daqueue-persist-drvr.sh \ testsuites/diag-common.conf \ queue-persist.sh \ queue-persist-drvr.sh \ |