diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 18:23:53 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 18:23:53 +0200 |
commit | 8d8befaeca0d9ed3f096780e499a3231f16585c4 (patch) | |
tree | 36afcf98e28dd7bba95e383d397e4f6ad84cbf01 /tests/Makefile.am | |
parent | f8d9aad08222f59ba2d27437c1e2369896452aa1 (diff) | |
parent | 23dac82b684e966490de707a44144b3ad0ce2323 (diff) | |
download | rsyslog-8d8befaeca0d9ed3f096780e499a3231f16585c4.tar.gz rsyslog-8d8befaeca0d9ed3f096780e499a3231f16585c4.tar.xz rsyslog-8d8befaeca0d9ed3f096780e499a3231f16585c4.zip |
Merge branch 'v3-stable' into beta
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r-- | tests/Makefile.am | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index ab1c5a62..02c67d81 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,11 +1,17 @@ +<<<<<<< HEAD:tests/Makefile.am TESTRUNS = rt_init rscript check_PROGRAMS = $(TESTRUNS) ourtail udptester -TESTS = $(TESTRUNS) cfg.sh parsertest.sh omod-if-array.sh +TESTS = $(TESTRUNS) cfg.sh parsertest.sh omod-if-array.sh \ + validation-run.sh TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/ DISTCLEANFILES=rsyslog.pid test_files = testbench.h runtime-dummy.c EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ + validation-run.sh \ + testsuites/invalid.conf \ + testsuites/valid.conf \ + cfg.sh \ cfg1.cfgtest \ cfg1.testin \ cfg2.cfgtest \ |