From c2be1270d78c04d9987e73468b075625659b4c65 Mon Sep 17 00:00:00 2001
From: Michael Howell <michael@notriddle.com>
Date: Wed, 27 Jul 2016 17:30:42 -0700
Subject: [PATCH 1/2] Re-enable intermittents fixed by #12543

  * Fixes #11574
  * Fixes #11561
---
 .../css-transforms-1_dev/html/transform-abspos-002.htm.ini     | 3 ---
 .../css-transforms-1_dev/html/transform-abspos-007.htm.ini     | 3 ---
 .../css-transforms-1_dev/html/transform-table-007.htm.ini      | 3 ---
 3 files changed, 9 deletions(-)
 delete mode 100644 tests/wpt/metadata-css/css-transforms-1_dev/html/transform-abspos-002.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css-transforms-1_dev/html/transform-abspos-007.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css-transforms-1_dev/html/transform-table-007.htm.ini

diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-abspos-002.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-abspos-002.htm.ini
deleted file mode 100644
index 834651c26b3..00000000000
--- a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-abspos-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transform-abspos-002.htm]
-  type: reftest
-  disabled: https://github.com/servo/servo/issues/11561
diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-abspos-007.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-abspos-007.htm.ini
deleted file mode 100644
index d3924d64958..00000000000
--- a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-abspos-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transform-abspos-007.htm]
-  type: reftest
-  disabled: https://github.com/servo/servo/issues/11561
diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-table-007.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-table-007.htm.ini
deleted file mode 100644
index 839df62416d..00000000000
--- a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-table-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transform-table-007.htm]
-  type: reftest
-  disabled: https://github.com/servo/servo/issues/11574

From c71cb199f12cbea3aedd50b1f17b0f284ce9e326 Mon Sep 17 00:00:00 2001
From: Michael Howell <michael@notriddle.com>
Date: Wed, 27 Jul 2016 17:31:48 -0700
Subject: [PATCH 2/2] Add script to check for intermittent regressions

Fixes #12435
---
 etc/ci/buildbot_steps.yml           |  8 ++++++++
 etc/ci/check_intermittents.sh       | 24 ++++++++++++++++++++++++
 etc/ci/former_intermittents_css.txt |  3 +++
 etc/ci/former_intermittents_wpt.txt |  0
 4 files changed, 35 insertions(+)
 create mode 100755 etc/ci/check_intermittents.sh
 create mode 100644 etc/ci/former_intermittents_css.txt
 create mode 100644 etc/ci/former_intermittents_wpt.txt

diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml
index 473c6379d5a..c5f3ad63b7b 100644
--- a/etc/ci/buildbot_steps.yml
+++ b/etc/ci/buildbot_steps.yml
@@ -27,6 +27,14 @@ mac-nightly:
   - ./mach package --release
   - ./etc/ci/upload_nightly.sh mac
 
+linux-rel-intermittent:
+  - ./mach build --release
+  - ./etc/ci/check_intermittents.sh
+
+mac-rel-intermittent:
+  - ./mach build --release
+  - ./etc/ci/check_intermittents.sh
+
 linux-dev:
   - ./mach test-tidy --no-progress --all
   - ./mach test-tidy --no-progress --self-test
diff --git a/etc/ci/check_intermittents.sh b/etc/ci/check_intermittents.sh
new file mode 100755
index 00000000000..0ba915e4a86
--- /dev/null
+++ b/etc/ci/check_intermittents.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+REPEAT_COUNT=100
+
+for test_type in wpt css; do
+    while read test_name; do
+        echo "  - Checking ${test_name}"
+        ./mach "test-${test_type}" \
+            --release \
+            --log-raw - \
+            --repeat "${REPEAT_COUNT}" \
+            "${test_name}" \
+            > intermittents.log \
+            < /dev/null
+    done < "etc/ci/former_intermittents_${test_type}.txt"
+done
+
diff --git a/etc/ci/former_intermittents_css.txt b/etc/ci/former_intermittents_css.txt
new file mode 100644
index 00000000000..19abe956cb8
--- /dev/null
+++ b/etc/ci/former_intermittents_css.txt
@@ -0,0 +1,3 @@
+/css-transforms-1_dev/html/transform-table-007.htm
+/css-transforms-1_dev/html/transform-abspos-002.htm
+/css-transforms-1_dev/html/transform-abspos-007.htm
diff --git a/etc/ci/former_intermittents_wpt.txt b/etc/ci/former_intermittents_wpt.txt
new file mode 100644
index 00000000000..e69de29bb2d