summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/excludes/_wercker/TestThreadQueue.rb (renamed from test/excludes/_wercker/test-mjit/TestThreadQueue.rb)2
-rw-r--r--wercker.yml4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/excludes/_wercker/test-mjit/TestThreadQueue.rb b/test/excludes/_wercker/TestThreadQueue.rb
index 846e99fcb2..b7a831f1b5 100644
--- a/test/excludes/_wercker/test-mjit/TestThreadQueue.rb
+++ b/test/excludes/_wercker/TestThreadQueue.rb
@@ -1,2 +1,2 @@
# https://app.wercker.com/ruby/ruby/runs/test-mjit/5bcf51409b1e440006d47831?step=5bcf517d87436a000649326d
-exclude(:test_queue_with_trap, 'this test does not succeed with --jit')
+exclude(:test_queue_with_trap, 'this test randomly fails with --jit or --jit-wait')
diff --git a/wercker.yml b/wercker.yml
index 4723ed1b15..9e74b6f479 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -27,7 +27,7 @@ test-mjit:
code: /usr/bin/sudo -H -u test -- make test RUN_OPTS="--disable-gems --jit --jit-warnings"
- script:
name: make test-all (JIT)
- code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit --jit-warnings" TESTOPTS="--color=never --job-status=normal --longest 10 --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit"
+ code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit --jit-warnings" TESTOPTS="--color=never --job-status=normal --longest 10 --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker"
- script:
name: make test-spec (JIT)
code: /usr/bin/sudo -H -u test -- make test-spec RUN_OPTS="--disable-gems --jit --jit-warnings"
@@ -60,7 +60,7 @@ test-mjit-wait:
code: /usr/bin/sudo -H -u test -- make test RUN_OPTS="--disable-gems --jit-wait --jit-warnings"
- script:
name: make test-all (JIT wait)
- code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTOPTS="--color=never --job-status=normal --longest 10 --subprocess-timeout-scale=3.0"
+ code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTOPTS="--color=never --job-status=normal --longest 10 --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker"
- script:
name: make test-spec (JIT wait)
code: /usr/bin/sudo -H -u test -- make test-spec RUN_OPTS="--disable-gems --jit-wait --jit-warnings"