Target both old and new driver and OS versions on Win NVIDIA GTX 1660
Apply test suite modifications necessary both for old and new drivers,
modifications for old drivers to be removed after the upgrade.
Bug: 40805707, b/297347572
Change-Id: I256fde2ba8d330b69f49483c22ee7d21da826001
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6085342
Auto-Submit: Yuly Novikov <[email protected]>
Commit-Queue: Yuly Novikov <[email protected]>
Reviewed-by: Brian Sheedy <[email protected]>
Commit-Queue: Brian Sheedy <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1394520}
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index e72af23f..0ec36ad5 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -110,6 +110,15 @@
'linux-chromeos-chrome-preuprev', # http://b/331706144
],
},
+ 'context_lost_passthrough_graphite_tests': {
+ 'remove_from': [
+ # TODO(b/297347572): Re-enable these tests once the driver version
+ # is sufficiently new. Win/NVIDIA currently doesn't support Graphite
+ # on certain drivers due to this blocklist entry.
+ # https://source.chromium.org/chromium/chromium/src/+/e9c0af7850eb012c12073d5de77bfe079609016c:gpu/config/software_rendering_list.json;l=1433-1452
+ 'Win V8 FYI Release (NVIDIA)',
+ ],
+ },
'expected_color_pixel_gl_passthrough_ganesh_test': {
'replacements': {
'Mac V8 FYI Release (Intel)': {
@@ -137,6 +146,24 @@
},
},
},
+ 'expected_color_pixel_passthrough_graphite_test': {
+ 'remove_from': [
+ # TODO(b/297347572): Re-enable these tests once the driver version
+ # is sufficiently new. Win/NVIDIA currently doesn't support Graphite
+ # on certain drivers due to this blocklist entry.
+ # https://source.chromium.org/chromium/chromium/src/+/e9c0af7850eb012c12073d5de77bfe079609016c:gpu/config/software_rendering_list.json;l=1433-1452
+ 'Win V8 FYI Release (NVIDIA)',
+ ],
+ 'replacements': {
+ # The V8 builders pass the V8 revision for ${got_revision}, so instead
+ # use ${got_cr_revision}, which is only set on the V8 bots.
+ 'Win V8 FYI Release (NVIDIA)': {
+ 'args': {
+ '--git-revision': '${got_cr_revision}',
+ },
+ },
+ },
+ },
'expected_color_pixel_passthrough_test': {
'replacements': {
# The V8 builders pass the V8 revision for ${got_revision}, so instead
@@ -307,7 +334,33 @@
},
},
},
+ 'pixel_skia_gold_passthrough_graphite_test': {
+ 'remove_from': [
+ # TODO(b/297347572): Re-enable these tests once the driver version
+ # is sufficiently new. Win/NVIDIA currently doesn't support Graphite
+ # on certain drivers due to this blocklist entry.
+ # https://source.chromium.org/chromium/chromium/src/+/e9c0af7850eb012c12073d5de77bfe079609016c:gpu/config/software_rendering_list.json;l=1433-1452
+ 'Win V8 FYI Release (NVIDIA)',
+ ],
+ 'replacements': {
+ # The V8 builders pass the V8 revision for ${got_revision}, so instead
+ # use ${got_cr_revision}, which is only set on the V8 bots.
+ 'Win V8 FYI Release (NVIDIA)': {
+ 'args': {
+ '--git-revision': '${got_cr_revision}',
+ },
+ },
+ },
+ },
'pixel_skia_gold_passthrough_test': {
+ 'modifications': {
+ 'Win V8 FYI Release (NVIDIA)': {
+ 'args': [
+ # TODO(crbug.com/382422293): Remove when fixed
+ '--jobs=1',
+ ],
+ },
+ },
'replacements': {
# The V8 builders pass the V8 revision for ${got_revision}, so instead
# use ${got_cr_revision}, which is only set on the V8 bots.
@@ -324,6 +377,9 @@
'Win V8 FYI Release (NVIDIA)': {
'args': {
'--git-revision': '${got_cr_revision}',
+ # Magic substitution happens after regular replacement, so remove it
+ # now since we are manually applying the number of jobs above.
+ '$$MAGIC_SUBSTITUTION_GPUParallelJobs': None,
},
},
},
@@ -361,6 +417,15 @@
},
},
},
+ 'screenshot_sync_passthrough_graphite_tests': {
+ 'remove_from': [
+ # TODO(b/297347572): Re-enable these tests once the driver version
+ # is sufficiently new. Win/NVIDIA currently doesn't support Graphite
+ # on certain drivers due to this blocklist entry.
+ # https://source.chromium.org/chromium/chromium/src/+/e9c0af7850eb012c12073d5de77bfe079609016c:gpu/config/software_rendering_list.json;l=1433-1452
+ 'Win V8 FYI Release (NVIDIA)',
+ ],
+ },
'telemetry_perf_unittests': {
'modifications': {
'chromeos-eve-chrome': {
@@ -465,4 +530,10 @@
'Mac V8 FYI Release (Intel)',
],
},
+ 'webgl_conformance_vulkan_passthrough_tests': {
+ 'remove_from': [
+ # TODO(crbug.com/380431384): Re-enable when fixed
+ 'Win V8 FYI Release (NVIDIA)',
+ ],
+ },
}
