diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | tests/Makefile.am | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,4 +1,10 @@ --------------------------------------------------------------------------- +Version 4.4.1 [v4-stable] (rgerhards), 2009-08-?? +- bugfix: Java testing tools were required, even if testbench was disabled + This resulted in build errors if no Java was present on the build system, + even though none of the selected option actually required Java. + (I forgot to backport a similar fix to newer releases). +--------------------------------------------------------------------------- Version 4.4.0 [v4-stable] (rgerhards), 2009-08-21 - bugfix: stderr/stdout were not closed to be able to emit error messages, but this caused ssh sessions to hang. Now we close them after the diff --git a/tests/Makefile.am b/tests/Makefile.am index 88c3137e..3f5a6c33 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,14 +12,14 @@ if ENABLE_OMSTDOUT TESTS += omod-if-array.sh parsertest.sh inputname.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 \ |