Backed out changeset 33ccfb45bb3f (bug 1585683) on jgilbert's request

dom/webgpu/mochitest/mochitest-no-pref.ini

@@ -1,4 +1,5 @@
 [DEFAULT]
-subsuite = webgpu
+subsuite = webgl1-core
 
 [test_disabled.html]
+

dom/webgpu/mochitest/mochitest.ini

@@ -1,5 +1,5 @@
 [DEFAULT]
-subsuite = webgpu
+subsuite = webgl1-core
 prefs = dom.webgpu.enabled=true
 
 [test_enabled.html]

taskcluster/ci/test/mochitest.yml

@@ -480,30 +480,6 @@ mochitest-webgl2-deqp:
         mochitest-flavor: plain
         chunked: true
 
-mochitest-webgpu:
-    description: "Mochitest webgpu run"
-    treeherder-symbol: M(webgpu)
-    run-on-projects:
-        by-test-platform:
-            windows10-aarch64/opt: ['try']
-            default: built-projects
-    virtualization: virtual-with-gpu
-    e10s: true
-    loopback-video: true
-    tier:
-        by-test-platform:
-            windows10-aarch64.*: 2
-            default: default
-    max-run-time:
-        by-test-platform:
-            windows.*: 5400
-            macosx.*64-ccov/.*: 7200
-            default: 3600
-    # Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
-    allow-software-gl-layers: false
-    mozharness:
-        mochitest-flavor: plain
-
 mochitest-remote:
     description: "Mochitest for the remote agent (/remote folder)"
     suite:

taskcluster/ci/test/test-sets.yml

@@ -40,7 +40,6 @@ common-tests:
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
-    - mochitest-webgpu
     - reftest
     - reftest-no-accel
     - telemetry-tests-client
@@ -353,7 +352,6 @@ linux-common-tests:
     - mochitest-remote
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
-    - mochitest-webgpu
     - reftest
     - reftest-no-accel
     - telemetry-tests-client
@@ -386,7 +384,6 @@ linux-qr-tests:
     - mochitest-chrome
     - mochitest-webgl1-core
     - mochitest-webgl2-core
-    - mochitest-webgpu
     - reftest
 
 linux-qr-smoketests:
@@ -404,7 +401,6 @@ windows-qr-tests:
     - mochitest-media
     - mochitest-webgl1-core
     - mochitest-webgl2-core
-    - mochitest-webgpu
     - reftest
 
 ccov-code-coverage-tests:
@@ -435,7 +431,6 @@ windows-tests:
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
-    - mochitest-webgpu
     - reftest
     - reftest-no-accel
     - telemetry-tests-client
@@ -454,7 +449,6 @@ mingwclang-tests-debug:
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
-    - mochitest-webgpu
     - reftest
     - telemetry-tests-client
 
@@ -479,7 +473,6 @@ windows-aarch64-tests:
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
-    - mochitest-webgpu
     - reftest
     - web-platform-tests
     - web-platform-tests-crashtests
@@ -530,7 +523,6 @@ macosx1014-64-tests:
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
-    - mochitest-webgpu
     - reftest
     - telemetry-tests-client
     - test-verify

testing/mozbase/moztest/moztest/resolve.py

@@ -163,7 +163,6 @@ TEST_SUITES = {
     'mochitest-webgl2-core': WebglSuite('webgl2-core'),
     'mochitest-webgl2-ext': WebglSuite('webgl2-ext'),
     'mochitest-webgl2-deqp': WebglSuite('webgl2-deqp'),
-    'mochitest-webgpu': WebglSuite('webgpu'),
     'puppeteer': {
         'aliases': ('remote/test/puppeteer',),
         'mach_command': 'puppeteer-test',

testing/mozharness/configs/android/android_common.py

@@ -83,7 +83,6 @@ config = {
         "mochitest-webgl1-ext": WebglSuite("webgl1-ext"),
         "mochitest-webgl2-ext": WebglSuite("webgl2-ext"),
         "mochitest-webgl2-deqp": WebglSuite("webgl2-deqp"),
-        "mochitest-webgpu": WebglSuite("webgpu"),
         "mochitest-plain-gpu": {
             "run_filename": "runtestsremote.py",
             "testsdir": "mochitest",

testing/mozharness/configs/unittests/linux_unittest.py

@@ -160,7 +160,6 @@ config = {
         "mochitest-webgl2-core": ["--subsuite=webgl2-core"],
         "mochitest-webgl2-ext": ["--subsuite=webgl2-ext"],
         "mochitest-webgl2-deqp": ["--subsuite=webgl2-deqp"],
-        "mochitest-webgpu": ["--subsuite=webgpu"],
         "mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"],
         "mochitest-devtools-chrome-coverage": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime", "--timeout=1200"],
         "mochitest-a11y": ["--flavor=a11y", "--disable-e10s"],

testing/mozharness/configs/unittests/mac_unittest.py

@@ -127,7 +127,6 @@ config = {
         "mochitest-webgl2-core": ["--subsuite=webgl2-core"],
         "mochitest-webgl2-ext": ["--subsuite=webgl2-ext"],
         "mochitest-webgl2-deqp": ["--subsuite=webgl2-deqp"],
-        "mochitest-webgpu": ["--subsuite=webgpu"],
         "mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"],
         "mochitest-devtools-chrome-webreplay": ["--flavor=browser", "--subsuite=devtools-webreplay"],
         "mochitest-a11y": ["--flavor=a11y", "--disable-e10s"],

testing/mozharness/configs/unittests/win_unittest.py

@@ -150,7 +150,6 @@ config = {
         "mochitest-webgl2-core": ["--subsuite=webgl2-core"],
         "mochitest-webgl2-ext": ["--subsuite=webgl2-ext"],
         "mochitest-webgl2-deqp": ["--subsuite=webgl2-deqp"],
-        "mochitest-webgpu": ["--subsuite=webgpu"],
         "mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"],
         "mochitest-a11y": ["--flavor=a11y", "--disable-e10s"],
         "mochitest-remote": ["--flavor=browser", "--subsuite=remote"],

testing/mozharness/mozharness/mozilla/testing/errors.py

@@ -32,7 +32,6 @@ TinderBoxPrintRe = {
     "mochitest-webgl2-core_summary": _mochitest_summary,
     "mochitest-webgl2-ext_summary": _mochitest_summary,
     "mochitest-webgl2-deqp_summary": _mochitest_summary,
-    "mochitest-webgpu_summary": _mochitest_summary,
     "mochitest-media_summary": _mochitest_summary,
     "mochitest-plain_summary": _mochitest_summary,
     "mochitest-plain-gpu_summary": _mochitest_summary,

testing/mozharness/mozharness/mozilla/testing/per_test_base.py

@@ -158,7 +158,6 @@ class SingleTestMixin(object):
                 ('mochitest-plain', 'webgl2-core', None): 'mochitest-webgl2-core',
                 ('mochitest-plain', 'webgl2-ext', None): 'mochitest-webgl2-ext',
                 ('mochitest-plain', 'webgl2-deqp', None): 'mochitest-webgl2-deqp',
-                ('mochitest-plain', 'webgpu', None): 'mochitest-webgpu',
             }
             if entry in subsuite_mapping:
                 suite = subsuite_mapping[entry]

testing/mozharness/mozharness/mozilla/testing/testbase.py

@@ -318,7 +318,6 @@ You can set this by specifying --test-url URL
             'mochitest-webgl2-core': 'mochitest',
             'mochitest-webgl2-ext': 'mochitest',
             'mochitest-webgl2-deqp': 'mochitest',
-            'mochitest-webgpu': 'mochitest',
             'geckoview': 'mochitest',
             'geckoview-junit': 'mochitest',
             'jsreftest': 'reftest',