diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-31 20:06:10 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-31 20:06:10 +0200 |
| commit | 3b9fd5330a6599c00e9c3c0a4080a141f173aa6a (patch) | |
| tree | f01a660c1ccf5070101b32a9e7eb75e07c0c6e57 /tests/Makefile.am | |
| parent | 3e3a9bc9982331e44cf397fef131e75553f2ab2c (diff) | |
| parent | 91d6888a8afe562bf4d2ef53be94c41898e1a2ec (diff) | |
| download | rsyslog-3b9fd5330a6599c00e9c3c0a4080a141f173aa6a.tar.gz rsyslog-3b9fd5330a6599c00e9c3c0a4080a141f173aa6a.tar.xz rsyslog-3b9fd5330a6599c00e9c3c0a4080a141f173aa6a.zip | |
Merge branch 'master' into sol-test
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 65a294ca..093742db 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,11 +1,10 @@ -testruns = rt_init rscript -check_PROGRAMS = $(testruns) ourtail -TESTS = $(testruns) cfg.sh +check_PROGRAMS = rt_init rscript ourtail parsertest +TESTS = $(check_PROGRAMS) cfg.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 \ - cfg.sh \ +EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ cfg1.cfgtest \ cfg1.testin \ cfg2.cfgtest \ @@ -16,7 +15,15 @@ EXTRA_DIST=1.rstest 2.rstest 3.rstest err1.rstest \ cfg4.testin \ DevNull.cfgtest \ err1.rstest \ - NoExistFile.cfgtest + NoExistFile.cfgtest \ + testruns/parser.conf \ + testruns/1.parse1 \ + testruns/rfc3164.parse1 \ + testruns/rfc5424-1.parse1 \ + testruns/rfc5424-2.parse1 \ + testruns/rfc5424-3.parse1 \ + testruns/rfc5424-4.parse1 \ + cfg.sh ourtail_SOURCES = ourtail.c |