Commit 72dd53f4 authored by Kenneth Russell's avatar Kenneth Russell Committed by Commit Bot

Implement generate_test_filter_args in GpuIntegrationTestAdapater.

Functionality was lost during a recent refactor. Tested manually.

Tbr: nednguyen@google.com
Bug: 898528
Change-Id: Ia850e2c74e2dc353e8c18fbca8b90d3efef21908
Reviewed-on: https://chromium-review.googlesource.com/c/1298314Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarNed Nguyen <nednguyen@google.com>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#602446}
parent 79186ecc
...@@ -41,6 +41,17 @@ class GpuIntegrationTestAdapater(common.BaseIsolatedScriptArgsAdapter): ...@@ -41,6 +41,17 @@ class GpuIntegrationTestAdapater(common.BaseIsolatedScriptArgsAdapter):
def generate_test_output_args(self, output): def generate_test_output_args(self, output):
return ['--write-full-results-to', output] return ['--write-full-results-to', output]
def generate_test_filter_args(self, test_filter_str):
filter_list = common.extract_filter_list(test_filter_str)
# isolated_script_test_filter comes in like:
# gpu_tests.webgl_conformance_integration_test.WebGLConformanceIntegrationTest.WebglExtension_WEBGL_depth_texture # pylint: disable=line-too-long
# but we need to pass it to --test-filter like this:
# WebglExtension_WEBGL_depth_texture
filter_list = [f.split('.')[-1] for f in filter_list]
# Need to convert this to a valid regex.
filter_regex = '(' + '|'.join(filter_list) + ')'
return ['--test-filter=%s' % filter_regex]
def generate_sharding_args(self, total_shards, shard_index): def generate_sharding_args(self, total_shards, shard_index):
return ['--total-shards=%d' % total_shards, return ['--total-shards=%d' % total_shards,
'--shard-index=%d' % shard_index] '--shard-index=%d' % shard_index]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment