From 29207a939f7df6a5583741243cd255cc58812eea Mon Sep 17 00:00:00 2001
From: k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 23 Oct 2018 16:23:55 +0000
Subject: [PATCH] wercker.yml: run both --jit and --jit-wait

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 wercker.yml | 46 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/wercker.yml b/wercker.yml
index 278548dcb6..740bb896aa 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -5,7 +5,8 @@
 box: ruby:2.5-stretch
 no-response-timeout: 30
 command-timeout: 60
-build:
+
+test-mjit:
   steps:
     - install-packages:
         packages: bison sudo
@@ -15,27 +16,58 @@ build:
     - script:
         name: create user # some file permission tests don't succeed with root.
         code: useradd --shell /bin/bash --create-home test && chown -R test:test .
-
     - script:
         name: configure
         code: /usr/bin/sudo -H -u test -- bash -c 'autoconf && ./configure --disable-install-doc --prefix=/tmp/ruby-prefix'
     - script:
         name: make all install
         code: /usr/bin/sudo -H -u test -- make -j$(nproc) all install
-
     - script:
         name: make test (JIT)
-        code: /usr/bin/sudo -H -u test -- make test RUN_OPTS="--disable-gems --jit-wait --jit-warnings"
+        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 TESTOPTS="--color=never --job-status=normal --longest 10" RUN_OPTS="--disable-gems --jit-wait --jit-warnings"
+        code: /usr/bin/sudo -H -u test -- make test-all TESTOPTS="--color=never --job-status=normal --longest 10" RUN_OPTS="--disable-gems --jit --jit-warnings"
     - script:
         name: make test-spec (JIT)
-        code: /usr/bin/sudo -H -u test -- make test-spec RUN_OPTS="--disable-gems --jit-wait --jit-warnings"
-
+        code: /usr/bin/sudo -H -u test -- make test-spec RUN_OPTS="--disable-gems --jit --jit-warnings"
   after-steps:
     - wantedly/pretty-slack-notify:
       webhook_url: $SLACK_WEBHOOK_URL
+      username: Wercker test-mjit
+      channel: alerts
+      notify_on: "failed"
+      branches: ^trunk$
+
+test-mjit-wait:
+  steps:
+    - install-packages:
+        packages: bison sudo
+    - script:
+        name: workaround ipv6 localhost
+        code: ruby -e "hosts = File.read('/etc/hosts').sub(/^::1\s*localhost.*$/, ''); File.write('/etc/hosts', hosts)"
+    - script:
+        name: create user # some file permission tests don't succeed with root.
+        code: useradd --shell /bin/bash --create-home test && chown -R test:test .
+    - script:
+        name: configure
+        code: /usr/bin/sudo -H -u test -- bash -c 'autoconf && ./configure --disable-install-doc --prefix=/tmp/ruby-prefix'
+    - script:
+        name: make all install
+        code: /usr/bin/sudo -H -u test -- make -j$(nproc) all install
+    - script:
+        name: make test (JIT 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 TESTOPTS="--color=never --job-status=normal --longest 10" RUN_OPTS="--disable-gems --jit-wait --jit-warnings"
+    - 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"
+  after-steps:
+    - wantedly/pretty-slack-notify:
+      webhook_url: $SLACK_WEBHOOK_URL
+      username: Wercker test-mjit-wait
       channel: alerts
       notify_on: "failed"
       branches: ^trunk$