diff options
3 files changed, 30 insertions, 11 deletions
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json index ab3b6c8eb5..1b66c3b71e 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json @@ -230,8 +230,8 @@ "pdf", "--randomProcessorTest", "--nocpu", - "--ddl", - "1", + "--skpViewportSize", + "2048", "--config", "gl", "--src", diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json index 0154aa2fe5..fdea1892d5 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json @@ -230,11 +230,12 @@ "pdf", "--randomProcessorTest", "--nocpu", - "--ddl", - "3", + "--skpViewportSize", + "2048", "--config", - "gl", + "ddl-gl", "--src", + "gm", "skp", "--blacklist", "gl1010102", @@ -337,6 +338,10 @@ "image", "_", ".SRW", + "--match", + "~shadermaskfilter_image", + "~imagefilterscropped", + "~animated-image-blurs", "--nonativeFonts", "--verbose" ], diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 4375da6e4f..8458320e2b 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -239,11 +239,13 @@ def dm_flags(api, bot): # DDL is a GPU-only feature if 'DDL1' in bot: - configs = [c for c in configs if c == 'gl' or c == 'gles'] - args.extend(['--ddl', "1"]) + # Just run gl for now but render the large skps + configs = ['gl'] + args.extend(['--skpViewportSize', "2048"]) if 'DDL3' in bot: - configs = [c for c in configs if c == 'gl' or c == 'gles'] - args.extend(['--ddl', "3"]) + # Just run ddl-gl for now but render the large skps + configs = ['ddl-gl'] + args.extend(['--skpViewportSize', "2048"]) tf = api.vars.builder_cfg.get('test_filter') if 'All' != tf: @@ -278,14 +280,21 @@ def dm_flags(api, bot): args.remove('image') args.remove('colorImage') - # For now it only renders the skps (i.e., no tests, no gms) - if 'DDL1' in bot or 'DDL3' in bot: + if 'DDL1' in bot: + # The DDL1 bot just renders large skp images as a baseline for full DDL args.remove('tests') args.remove('gm') args.remove('image') args.remove('colorImage') args.remove('svg') + elif 'DDL3' in bot: + # The DDL3 bot renders large skps and gms in full DDL mode + args.remove('tests') + args.remove('image') + args.remove('colorImage') + args.remove('svg') else: + # Currently, only the DDL bots render skps args.remove('skp') # TODO: ??? @@ -550,6 +559,11 @@ def dm_flags(api, bot): match.append('~WritePixels') # skia:4711 match.append('~PremulAlphaRoundTrip_Gpu') # skia:7501 + if 'DDL3' in bot: + match.append('~shadermaskfilter_image') # skia:7751 + match.append('~imagefilterscropped') # skia:7751 + match.append('~animated-image-blurs') # skia:7751 + if 'Chromecast' in bot: if 'GPU' in bot: # skia:6687 |