diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:19:56 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:19:56 +0200 |
commit | de71589ca3145dfbe8e34790bb49e3d86d3d3bce (patch) | |
tree | 43a91ec3d4c7306c9ddda820b916e8da71b3d065 /tests/Makefile.am | |
parent | 2f4292a81c2bf89b349f0e276c69616ac6e51164 (diff) | |
parent | 8939ccfffd3a0580ead376234ad64a9602d4e4e6 (diff) | |
download | rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.gz rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.xz rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.zip |
Merge branch 'v6-stable'
Conflicts:
ChangeLog
configure.ac
runtime/ruleset.c
tools/syslogd.c
Diffstat (limited to 'tests/Makefile.am')
-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 |