diff --git a/testing/run_tests.py b/testing/run_tests.py index 8c84f5584ff5b4d2d3c1e0d75a736518283b1540..686430c1c82ebc92f893c96467c98b1797138caa 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -21,7 +21,7 @@ fonts_dir = os.path.join(buildroot_dir, 'flutter', 'third_party', 'txt', 'third_ roboto_font_path = os.path.join(fonts_dir, 'Roboto-Regular.ttf') dart_tests_dir = os.path.join(buildroot_dir, 'flutter', 'testing', 'dart',) -time_sensitve_test_flag = '--gtest_filter=-*TimeSensitiveTest*' +fml_unittests_filter = '--gtest_filter=-*TimeSensitiveTest*:*GpuThreadMerger*' def RunCmd(cmd, **kwargs): print(subprocess.check_output(cmd, **kwargs)) @@ -98,7 +98,7 @@ def RunCCTests(build_dir, filter): ] RunEngineExecutable(build_dir, 'flow_unittests', filter, flow_flags + shuffle_flags) - RunEngineExecutable(build_dir, 'fml_unittests', filter, [ time_sensitve_test_flag ] + shuffle_flags) + RunEngineExecutable(build_dir, 'fml_unittests', filter, [ fml_unittests_filter ] + shuffle_flags) RunEngineExecutable(build_dir, 'runtime_unittests', filter, shuffle_flags)