diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-25 15:59:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-25 15:59:46 +0200 |
| commit | b3e16a9f531dff0d973be3917eca114ab6ab7c45 (patch) | |
| tree | 498598eda1810eaa6b892a3c36e153f9bdabf282 /tests | |
| parent | d8ab04b533a6d2fc224e1931463b91508cc6d701 (diff) | |
| parent | 1164429974dcd71ef59dededd3fec54162d919dd (diff) | |
| download | rsyslog-b3e16a9f531dff0d973be3917eca114ab6ab7c45.tar.gz rsyslog-b3e16a9f531dff0d973be3917eca114ab6ab7c45.tar.xz rsyslog-b3e16a9f531dff0d973be3917eca114ab6ab7c45.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
runtime/msg.c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c50b7cd6..c5deaa47 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,14 +20,14 @@ TESTS += omod-if-array.sh \ fieldtest.sh endif +check_JAVA = DiagTalker.java + endif # if ENABLE_TESTBENCH TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/ DISTCLEANFILES=rsyslog.pid '$(abs_top_builddir)'/DiagTalker.class test_files = testbench.h runtime-dummy.c -check_JAVA = DiagTalker.java - EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ validation-run.sh \ testsuites/invalid.conf \ |