Commit 1fa733bc authored by Prakhar's avatar Prakhar Committed by Commit Bot

Set isolate_profile_data for Win10 Tests x64

It is the tester for windows coverage cq builder https://source.chromium.org/chromium/chromium/tools/build/+/master:recipes/recipe_modules/chromium_tests/trybots.py;l=1368

Also removes the same from GPU tester bot as we are not interested in coverage data in GPU tests

Bug: 1139007
Change-Id: Ie9b9bb2238d868e5d8c19c85ed1564425b79ecc5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2477693
Commit-Queue: Prakhar Asthana <pasthana@google.com>
Auto-Submit: Prakhar Asthana <pasthana@google.com>
Reviewed-by: default avatarYuke Liao <liaoyuke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818663}
parent c8f06863
...@@ -3950,7 +3950,6 @@ ...@@ -3950,7 +3950,6 @@
"--test-launcher-jobs=1", "--test-launcher-jobs=1",
"--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:TabCaptureApiPixelTest.EndToEnd*" "--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:TabCaptureApiPixelTest.EndToEnd*"
], ],
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
...@@ -3977,7 +3976,6 @@ ...@@ -3977,7 +3976,6 @@
"--use-gl=angle", "--use-gl=angle",
"--use-gpu-in-tests" "--use-gpu-in-tests"
], ],
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
...@@ -4002,7 +4000,6 @@ ...@@ -4002,7 +4000,6 @@
"args": [ "args": [
"--use-gpu-in-tests" "--use-gpu-in-tests"
], ],
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
...@@ -4026,7 +4023,6 @@ ...@@ -4026,7 +4023,6 @@
"args": [ "args": [
"standalone_angle_unittests" "standalone_angle_unittests"
], ],
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py" "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
...@@ -4051,7 +4047,6 @@ ...@@ -4051,7 +4047,6 @@
"args": [ "args": [
"--ignore-runtime-requirements=*" "--ignore-runtime-requirements=*"
], ],
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
...@@ -4084,7 +4079,6 @@ ...@@ -4084,7 +4079,6 @@
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle" "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle"
], ],
"isolate_name": "telemetry_gpu_integration_test", "isolate_name": "telemetry_gpu_integration_test",
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py" "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
...@@ -4116,7 +4110,6 @@ ...@@ -4116,7 +4110,6 @@
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
], ],
"isolate_name": "telemetry_gpu_integration_test", "isolate_name": "telemetry_gpu_integration_test",
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py" "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
...@@ -4148,7 +4141,6 @@ ...@@ -4148,7 +4141,6 @@
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
], ],
"isolate_name": "telemetry_gpu_integration_test", "isolate_name": "telemetry_gpu_integration_test",
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py" "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
...@@ -4180,7 +4172,6 @@ ...@@ -4180,7 +4172,6 @@
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
], ],
"isolate_name": "telemetry_gpu_integration_test", "isolate_name": "telemetry_gpu_integration_test",
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py" "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
...@@ -4216,7 +4207,6 @@ ...@@ -4216,7 +4207,6 @@
"1cb3" "1cb3"
], ],
"isolate_name": "telemetry_gpu_integration_test", "isolate_name": "telemetry_gpu_integration_test",
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py" "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
...@@ -4252,7 +4242,6 @@ ...@@ -4252,7 +4242,6 @@
"--git-revision=${got_revision}" "--git-revision=${got_revision}"
], ],
"isolate_name": "telemetry_gpu_integration_test", "isolate_name": "telemetry_gpu_integration_test",
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py" "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
...@@ -4293,7 +4282,6 @@ ...@@ -4293,7 +4282,6 @@
"--git-revision=${got_revision}" "--git-revision=${got_revision}"
], ],
"isolate_name": "telemetry_gpu_integration_test", "isolate_name": "telemetry_gpu_integration_test",
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py" "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
...@@ -4327,7 +4315,6 @@ ...@@ -4327,7 +4315,6 @@
"--browser=release_x64" "--browser=release_x64"
], ],
"isolate_name": "rendering_representative_perf_tests", "isolate_name": "rendering_representative_perf_tests",
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py" "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
...@@ -4358,7 +4345,6 @@ ...@@ -4358,7 +4345,6 @@
"--dont-restore-color-profile-after-test" "--dont-restore-color-profile-after-test"
], ],
"isolate_name": "telemetry_gpu_integration_test", "isolate_name": "telemetry_gpu_integration_test",
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py" "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
...@@ -4390,7 +4376,6 @@ ...@@ -4390,7 +4376,6 @@
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
], ],
"isolate_name": "telemetry_gpu_integration_test", "isolate_name": "telemetry_gpu_integration_test",
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py" "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
...@@ -4423,7 +4408,6 @@ ...@@ -4423,7 +4408,6 @@
"--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl_conformance_tests_output.json" "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl_conformance_tests_output.json"
], ],
"isolate_name": "telemetry_gpu_integration_test", "isolate_name": "telemetry_gpu_integration_test",
"isolate_profile_data": true,
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py" "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
......
This diff is collapsed.
...@@ -3348,7 +3348,6 @@ ...@@ -3348,7 +3348,6 @@
'browser_config': 'release_x64', 'browser_config': 'release_x64',
'os_type': 'win', 'os_type': 'win',
'mixins': [ 'mixins': [
'isolate_profile_data',
'win10_nvidia_quadro_p400_stable', 'win10_nvidia_quadro_p400_stable',
], ],
'test_suites': { 'test_suites': {
...@@ -5378,9 +5377,6 @@ ...@@ -5378,9 +5377,6 @@
}, },
}, },
'Win x64 Builder': { 'Win x64 Builder': {
'mixins': [
'isolate_profile_data',
],
'additional_compile_targets': [ 'additional_compile_targets': [
'pdf_fuzzers' 'pdf_fuzzers'
], ],
...@@ -5395,6 +5391,7 @@ ...@@ -5395,6 +5391,7 @@
'mixins': [ 'mixins': [
'x86-64', 'x86-64',
'win10', 'win10',
'isolate_profile_data',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win10_gtests', 'gtest_tests': 'chromium_win10_gtests',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment