diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 11:55:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 11:55:41 +0200 |
| commit | 8939ccfffd3a0580ead376234ad64a9602d4e4e6 (patch) | |
| tree | 1749d023b626b2d30d9b9273b0d4f11fcbffea1b /tests | |
| parent | 0f52727043736b1e411bc60309ed18d41a4f1234 (diff) | |
| parent | 0c65e62965eefc1f8cebfaa3636ef72fc21c5260 (diff) | |
| download | rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.tar.gz rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.tar.xz rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
action.c
configure.ac
doc/manual.html
runtime/ruleset.c
template.h
threads.c
tools/syslogd.c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index aff44eef..c4560445 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -148,7 +148,9 @@ endif endif if ENABLE_EXTENDED_TESTS -TESTS += random.sh +# random.sh is temporarily disabled as it needs some work +# to rsyslog core to complete in reasonable time +#TESTS += random.sh endif if ENABLE_IMFILE |