diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-27 12:13:01 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-27 12:13:01 +0200 |
| commit | 8cd291a0c9eab23fa020d6560715a32c3370f78b (patch) | |
| tree | e89b794ccedbae3c46aa406f29fc5ce7a7f915b7 /tests | |
| parent | aba8792c8a82ef52a3188ee7295e501ca21dae3b (diff) | |
| parent | 7aa30acc744ae53aab2a0b2e3d1a1b0081d9e393 (diff) | |
| download | rsyslog-8cd291a0c9eab23fa020d6560715a32c3370f78b.tar.gz rsyslog-8cd291a0c9eab23fa020d6560715a32c3370f78b.tar.xz rsyslog-8cd291a0c9eab23fa020d6560715a32c3370f78b.zip | |
Merge branch 'v4-stable' into v4-beta
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 \ |