From 25dfa5ca564788f2ecbd8560aa60f43f24d51187 Mon Sep 17 00:00:00 2001
From: Vaibhav Agrawal <vaibhavmagarwal@gmail.com>
Date: Thu, 12 Mar 2015 01:22:13 +0800
Subject: [PATCH] Bug 1083347 - Removing gl.json and editing in-tree
 configurations.r=armenzg, gbrown DONTBUILD

---
 testing/config/mozharness/android_arm_4_3_config.py | 2 +-
 testing/config/mozharness/android_arm_config.py     | 2 +-
 testing/mochitest/gl.json                           | 5 -----
 testing/mochitest/moz.build                         | 1 -
 testing/mozharness/mozharness.json                  | 2 +-
 5 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 testing/mochitest/gl.json

diff --git a/testing/config/mozharness/android_arm_4_3_config.py b/testing/config/mozharness/android_arm_4_3_config.py
index 0d2f0b0588b8..23124cf62888 100644
--- a/testing/config/mozharness/android_arm_4_3_config.py
+++ b/testing/config/mozharness/android_arm_4_3_config.py
@@ -27,7 +27,7 @@ config = {
                 "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
                 "--quiet", "--log-raw=%(raw_log_file)s",
                 "--total-chunks=2",
-                "--test-manifest=gl.json",
+                "--manifest=tests/dom/canvas/test/_webgl-conformance.ini",
             ],
         },
         "robocop": {
diff --git a/testing/config/mozharness/android_arm_config.py b/testing/config/mozharness/android_arm_config.py
index 03792f3a0d72..68c1dd73c93b 100644
--- a/testing/config/mozharness/android_arm_config.py
+++ b/testing/config/mozharness/android_arm_config.py
@@ -29,7 +29,7 @@ config = {
                 "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
                 "--quiet", "--log-raw=%(raw_log_file)s",
                 "--total-chunks=2",
-                "--test-manifest=gl.json",
+                "--manifest=tests/dom/canvas/test/_webgl-conformance.ini",
             ],
         },
         "robocop": {
diff --git a/testing/mochitest/gl.json b/testing/mochitest/gl.json
deleted file mode 100644
index 7086e9cb1cbb..000000000000
--- a/testing/mochitest/gl.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "runtests": { "dom/canvas/test/webgl-conformance": "bug 865443" },
- "excludetests": {}
-}
-
diff --git a/testing/mochitest/moz.build b/testing/mochitest/moz.build
index a4f0786d38a3..676971371b56 100644
--- a/testing/mochitest/moz.build
+++ b/testing/mochitest/moz.build
@@ -52,7 +52,6 @@ TEST_HARNESS_FILES.testing.mochitest += [
     'chrome-harness.js',
     'chunkifyTests.js',
     'gen_template.pl',
-    'gl.json',
     'harness.xul',
     'jetpack-addon-harness.js',
     'jetpack-addon-overlay.xul',
diff --git a/testing/mozharness/mozharness.json b/testing/mozharness/mozharness.json
index a4d773d79791..0b381682035c 100644
--- a/testing/mozharness/mozharness.json
+++ b/testing/mozharness/mozharness.json
@@ -1,4 +1,4 @@
 {
     "repo": "https://hg.mozilla.org/build/mozharness",
-    "revision": "2452460c06fc"
+    "revision": "9e077d6e8a7f"
 }