Gold Trace Tests: Handle test filter.

This will allow the Chromium recipe retry mechanism to work properly. That in turn will let the recipe properly fail tests that pass without the patch and fail with the patch. Bug: angleproject:5299 Change-Id: Ic744e125779c6bc6a091e1ed89ac1be6b97fd942 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2518172Reviewed-by: Brian Sheedy <bsheedy@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Gold Trace Tests: Handle test filter.
302f234d · Jamie Madill · Commit Bot · 3e5b6f81 · 302f234d
Commit 302f234d authored Nov 03, 2020 by Jamie Madill Committed by Commit Bot Nov 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

restricted_trace_gold_tests.py src/tests/restricted_traces/restricted_trace_gold_tests.py +10 -1

No files found.
--- a/src/tests/restricted_traces/restricted_trace_gold_tests.py
+++ b/src/tests/restricted_traces/restricted_trace_gold_tests.py
@@ -22,6 +22,7 @@

 import argparse
 import contextlib
+import fnmatch
 import json
 import logging
 import os
@@ -323,8 +324,9 @@ def upload_test_result_to_skia_gold(args, gold_session_manager, gold_session, go

 def main():
    parser = argparse.ArgumentParser()
-    parser.add_argument('--isolated-script-test-output', type=str, required=True)
+    parser.add_argument('--isolated-script-test-output', type=str)
    parser.add_argument('--isolated-script-test-perf-output', type=str)
+    parser.add_argument('--isolated-script-test-filter', type=str)
    parser.add_argument('--test-suite', help='Test suite to run.', default=DEFAULT_TEST_SUITE)
    parser.add_argument('--render-test-output-dir', help='Directory to store screenshots')
    parser.add_argument('--xvfb', help='Start xvfb.', action='store_true')
@@ -365,6 +367,13 @@ def main():
            gold_session = gold_session_manager.GetSkiaGoldSession(keys)

            for test in tests['traces']:
+
+                # Apply test filter if present.
+                if args.isolated_script_test_filter:
+                    full_name = 'angle_restricted_trace_gold_tests.%s' % test
+                    if not fnmatch.fnmatch(test, args.isolated_script_test_filter):
+                        continue
+
                with common.temporary_file() as tempfile_path:
                    cmd = [
                        args.test_suite,