diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 14:22:50 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 14:22:50 +0200 |
| commit | c7e8282b9eb9d6452f7678c3f7c1e06337a3bb0a (patch) | |
| tree | 367dd15b293a18e9944aae02e547551674293930 /tests/Makefile.am | |
| parent | 5fd2bcce232352f3abbe235c788b9a8fa7bac043 (diff) | |
| parent | b9549380270fa68e27e8ee3f049c7d34156a85ff (diff) | |
| download | rsyslog-c7e8282b9eb9d6452f7678c3f7c1e06337a3bb0a.tar.gz rsyslog-c7e8282b9eb9d6452f7678c3f7c1e06337a3bb0a.tar.xz rsyslog-c7e8282b9eb9d6452f7678c3f7c1e06337a3bb0a.zip | |
Merge branch 'master' into ultra-reliable
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 556886e3..d581aeb2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,9 +6,12 @@ if ENABLE_OMSTDOUT TESTS += omod-if-array.sh parsertest.sh inputname.sh fieldtest.sh endif TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/ -DISTCLEANFILES=rsyslog.pid +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 \ cfg1.testin \ @@ -61,6 +64,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/1.inputname_imtcp_12516 \ omod-if-array.sh \ waitqueueempty.sh \ + DiagTalker.java \ cfg.sh ourtail_SOURCES = ourtail.c |