diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-27 11:37:10 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-27 11:37:10 +0200 |
commit | 35ea061f62cf0cbae074b2df47dc6b462da4fd20 (patch) | |
tree | 08c0735b16914c998d54f5731e2669b82b14facf /tests/Makefile.am | |
parent | 78bc40e1af312d076c4cc2225c9281b6725217f6 (diff) | |
parent | 74ed599ea6ab96cffba35ca14f5654523f89bc61 (diff) | |
download | rsyslog-35ea061f62cf0cbae074b2df47dc6b462da4fd20.tar.gz rsyslog-35ea061f62cf0cbae074b2df47dc6b462da4fd20.tar.xz rsyslog-35ea061f62cf0cbae074b2df47dc6b462da4fd20.zip |
Merge branch 'diag'
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r-- | tests/Makefile.am | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 92401511..713c721e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ TESTRUNS = rt_init rscript check_PROGRAMS = $(TESTRUNS) ourtail nettester tcpflood chkseq -TESTS = $(TESTRUNS) cfg.sh manytcp.sh diskqueue.sh imtcp-multiport.sh memq-persist.sh +TESTS = $(TESTRUNS) cfg.sh manytcp.sh diskqueue.sh imtcp-multiport.sh queue-persist.sh if ENABLE_OMSTDOUT TESTS += omod-if-array.sh parsertest.sh inputname.sh fieldtest.sh endif @@ -9,7 +9,6 @@ DISTCLEANFILES=rsyslog.pid '$(abs_top_builddir)'/DiagTalker.class test_files = testbench.h runtime-dummy.c check_JAVA = DiagTalker.java -#dist_java_JAVA = DiagTalker.java EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ cfg1.cfgtest \ @@ -49,10 +48,10 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/1.inputname_imtcp_12515 \ testsuites/1.inputname_imtcp_12516 \ omod-if-array.sh \ - waitqueueempty.sh \ - memq-persist.sh \ - testsuites/memq-persist1.sh \ - testsuites/memq-persist2.sh \ + diag.sh \ + queue-persist.sh \ + queue-persist-drvr.sh \ + testsuites/queue-persist.conf \ DiagTalker.java \ cfg.sh |