summaryrefslogtreecommitdiffstats
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-25 12:27:06 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-25 12:27:06 +0200
commit27a0078958d808a323c945b58b77ee96ee690444 (patch)
tree2bcd479d0e5b42dd92c715e917722d6519c922b0 /tests/Makefile.am
parent1eac94e11dab1e7caead5e31a57d2cae31b5ad62 (diff)
parentde71589ca3145dfbe8e34790bb49e3d86d3d3bce (diff)
downloadrsyslog-27a0078958d808a323c945b58b77ee96ee690444.tar.gz
rsyslog-27a0078958d808a323c945b58b77ee96ee690444.tar.xz
rsyslog-27a0078958d808a323c945b58b77ee96ee690444.zip
Merge branch 'master' into master-newtemplate
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am4
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