Re-enable previously failing tests on Win10 Intel Exp bot.

After the update to the 24.20.100.6286 driver, these tests should be passing. Re-enable: webgl_conformance_d3d9_tests webgl_conformance_d3d9_passthrough_tests conformance2/glsl3/short-circuiting-in-loop-condition.html Tbr: zmo@chromium.org Bug: 841789, 843369 Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel Change-Id: I1ec732be8a283c2fdb68bf316943ee2d7d0b65b1 Reviewed-on: https://chromium-review.googlesource.com/1207652 Reviewed-by: Kenneth Russell <kbr@chromium.org> Commit-Queue: Kenneth Russell <kbr@chromium.org> Cr-Commit-Position: refs/heads/master@{#588987}
hylschwy · Sep 5, 2018 · a784487 · a784487
1 parent 58b5608
commit a784487
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 14 deletions.
diff --git a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -321,8 +321,6 @@ def SetExpectations(self):
     # Win / Intel
     self.Fail('conformance/rendering/rendering-stencil-large-viewport.html',
         ['win', 'intel', 'd3d11'], bug=782317)
-    self.Fail('conformance2/glsl3/short-circuiting-in-loop-condition.html',
-        ['win', 'intel'], bug=843369)
 
     # Seems to cause the harness to fail immediately afterward
     self.Skip('conformance2/textures/video/tex-2d-rgba16f-rgba-half_float.html',

diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json
@@ -13164,6 +13164,54 @@
           "shards": 2
         }
       },
+      {
+        "args": [
+          "webgl_conformance",
+          "--show-stdout",
+          "--browser=release",
+          "--passthrough",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=d3d9 --use-cmd-decoder=passthrough"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "webgl_conformance_d3d9_passthrough_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "8086:5912-24.20.100.6286",
+              "os": "Windows-10",
+              "pool": "Chrome-GPU"
+            }
+          ],
+          "idempotent": false,
+          "shards": 2
+        }
+      },
+      {
+        "args": [
+          "webgl_conformance",
+          "--show-stdout",
+          "--browser=release",
+          "--passthrough",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=d3d9 --use-cmd-decoder=validating"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "webgl_conformance_d3d9_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "8086:5912-24.20.100.6286",
+              "os": "Windows-10",
+              "pool": "Chrome-GPU"
+            }
+          ],
+          "idempotent": false,
+          "shards": 2
+        }
+      },
       {
         "args": [
           "webgl_conformance",

diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
@@ -1269,18 +1269,6 @@
       'linux-chromeos-dbg',  # https://crbug.com/859307
     ],
   },
-  'webgl_conformance_d3d9_passthrough_tests': {
-    'remove_from': [
-      # TODO(jdarpinian): Re-enable when http://crbug.com/841789 is fixed.
-      'Win10 FYI Exp Release (Intel HD 630)',
-    ],
-  },
-  'webgl_conformance_d3d9_tests': {
-    'remove_from': [
-      # TODO(jdarpinian): Re-enable when http://crbug.com/841789 is fixed.
-      'Win10 FYI Exp Release (Intel HD 630)',
-    ],
-  },
   'webgl_conformance_tests': {
     'modifications': {
       # On desktop platforms these don't take very long (~7 minutes),