diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-12 12:39:10 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-12 12:39:10 +0200 |
| commit | 2a2a9716f7ee0debd192e75785e347f4e4af0b4d (patch) | |
| tree | 8d8fef67d1c7bdf11bd193f3ce93dae8e9530ba4 /tests/Makefile.am | |
| parent | 3b63b155ed5e4d58858baa3d6f07293099d8a4e5 (diff) | |
| parent | 20607ba1695b99838db7bdf809b22cf52bbdf5ce (diff) | |
| download | rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.tar.gz rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.tar.xz rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.zip | |
Merge branch 'master-newconf'
Conflicts:
ChangeLog
tools/omfile.c
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index a53840ac..d0c056ad 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,8 @@ if ENABLE_TESTBENCH # TODO: reenable TESTRUNS = rt_init rscript check_PROGRAMS = $(TESTRUNS) ourtail nettester tcpflood chkseq msleep randomgen diagtalker uxsockrcvr syslog_caller syslog_inject inputfilegen -TESTS = $(TESTRUNS) cfg.sh +TESTS = $(TESTRUNS) +#TESTS = $(TESTRUNS) cfg.sh if ENABLE_IMDIAG TESTS += \ |