From 3fee9235a465fbb7f6c0af6b0d7370fb795ce3aa Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Fri, 24 Aug 2018 13:30:34 -0400 Subject: [PATCH] Add a renderer key to lottie gold digests This will help us distinguish between "rendered by skottie", "rendered by lottie-web", etc. Bug: skia:8108 Change-Id: I48b489adf8f8b7f950df397e5e94c1103dc4d306 Reviewed-on: https://skia-review.googlesource.com/149237 Reviewed-by: Stephan Altmueller Commit-Queue: Kevin Lubick --- ...ian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie.json | 2 ++ ...Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Lottie.json | 2 ++ infra/bots/recipes/test.py | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie.json index f453a21e88..bec33082ae 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie.json @@ -195,6 +195,8 @@ "GCE", "os", "Debian9", + "renderer", + "skottie", "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Lottie.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Lottie.json index afb9b8dfe8..6dd68dca28 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Lottie.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Lottie.json @@ -195,6 +195,8 @@ "Golo", "os", "Ubuntu17", + "renderer", + "skottie", "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 44faac30f0..2fa9bf542b 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -821,6 +821,7 @@ def key_params(api): if k not in blacklist: flat.append(k) flat.append(api.vars.builder_cfg[k]) + return flat @@ -928,7 +929,12 @@ def test_steps(api): args.extend(['--lotties', api.flavor.device_dirs.lotties_dir]) args.append('--key') - args.extend(key_params(api)) + keys = key_params(api) + + if 'Lottie' in api.vars.builder_cfg.get('extra_config', ''): + keys.extend(['renderer', 'skottie']) + + args.extend(keys) if use_hash_file: args.extend(['--uninterestingHashesFile', hashes_file])