From 2811b5e6ca6ddbff1e34b9dbea735c8aeb1482d9 Mon Sep 17 00:00:00 2001
From: Jason Simmons <jsimmons@google.com>
Date: Tue, 9 Apr 2024 21:10:29 +0000
Subject: [PATCH] Enable gtest-parallel for Impeller unit tests

Fixes https://github.com/flutter/flutter/issues/143330
---
 testing/run_tests.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/testing/run_tests.py b/testing/run_tests.py
index dc04e6d9849ee..208660460345b 100755
--- a/testing/run_tests.py
+++ b/testing/run_tests.py
@@ -385,6 +385,10 @@ def __str__(self):
     '--gtest_shuffle',
 ]
 
+repeat_flags = [
+    '--repeat=2',
+]
+
 
 def run_cc_tests(build_dir, executable_filter, coverage, capture_core_dump):
   logger.info('Running Engine Unit-tests.')
@@ -393,10 +397,6 @@ def run_cc_tests(build_dir, executable_filter, coverage, capture_core_dump):
     import resource  # pylint: disable=import-outside-toplevel
     resource.setrlimit(resource.RLIMIT_CORE, (resource.RLIM_INFINITY, resource.RLIM_INFINITY))
 
-  repeat_flags = [
-      '--repeat=2',
-  ]
-
   def make_test(name, flags=None, extra_env=None):
     if flags is None:
       flags = repeat_flags
@@ -507,9 +507,10 @@ def make_test(name, flags=None, extra_env=None):
       )
     extra_env = metal_validation_env()
     extra_env.update(vulkan_validation_env(build_dir))
-    mac_impeller_unittests_flags = shuffle_flags + [
+    mac_impeller_unittests_flags = repeat_flags + [
+        '--gtest_filter=-*OpenGLES',  # These are covered in the golden tests.
+        '--',
         '--enable_vulkan_validation',
-        '--gtest_filter=-*OpenGLES'  # These are covered in the golden tests.
     ]
     # Impeller tests are only supported on macOS for now.
     run_engine_executable(
@@ -519,6 +520,7 @@ def make_test(name, flags=None, extra_env=None):
         mac_impeller_unittests_flags,
         coverage=coverage,
         extra_env=extra_env,
+        gtest=True,
         # TODO(https://github.com/flutter/flutter/issues/123733): Remove this allowlist.
         # See also https://github.com/flutter/flutter/issues/114872.
         allowed_failure_output=[
@@ -1272,9 +1274,10 @@ def main():
           build_dir,
           'impeller_unittests',
           engine_filter,
-          shuffle_flags,
+          repeat_flags,
           coverage=args.coverage,
-          extra_env=extra_env
+          extra_env=extra_env,
+          gtest=True
       )
     finally:
       xvfb.stop_virtual_x(build_name)