Commit b83f98d1 authored by Omer Katz's avatar Omer Katz Committed by Commit Bot

Updating flags for trybots

Replaced --enable-blink-features=HeapConcurrentMarking
with --enable-features=BlinkHeapConcurrentMarking.

Bug: 989278
Change-Id: Iab12b8784f413d6bb5e47b3c0a360d34dab9ddd6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1728585
Commit-Queue: Omer Katz <omerkatz@chromium.org>
Reviewed-by: default avatarMichael Lippautz <mlippautz@chromium.org>
Reviewed-by: default avatarMichael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683990}
parent 882414b8
...@@ -9006,7 +9006,7 @@ ...@@ -9006,7 +9006,7 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9024,7 +9024,7 @@ ...@@ -9024,7 +9024,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9042,7 +9042,7 @@ ...@@ -9042,7 +9042,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9060,7 +9060,7 @@ ...@@ -9060,7 +9060,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9078,7 +9078,7 @@ ...@@ -9078,7 +9078,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9096,7 +9096,7 @@ ...@@ -9096,7 +9096,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9114,7 +9114,7 @@ ...@@ -9114,7 +9114,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9133,7 +9133,7 @@ ...@@ -9133,7 +9133,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9151,7 +9151,7 @@ ...@@ -9151,7 +9151,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9169,7 +9169,7 @@ ...@@ -9169,7 +9169,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9188,7 +9188,7 @@ ...@@ -9188,7 +9188,7 @@
{ {
"args": [ "args": [
"--gtest_filter=-*UsingRealWebcam*", "--gtest_filter=-*UsingRealWebcam*",
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9206,7 +9206,7 @@ ...@@ -9206,7 +9206,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9224,7 +9224,7 @@ ...@@ -9224,7 +9224,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9242,7 +9242,7 @@ ...@@ -9242,7 +9242,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9260,7 +9260,7 @@ ...@@ -9260,7 +9260,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9281,7 +9281,7 @@ ...@@ -9281,7 +9281,7 @@
"args": [ "args": [
"--disable-perfetto", "--disable-perfetto",
"--gtest_filter=TracingControllerTest.*:BackgroundTracingManagerBrowserTest.*", "--gtest_filter=TracingControllerTest.*:BackgroundTracingManagerBrowserTest.*",
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9300,7 +9300,7 @@ ...@@ -9300,7 +9300,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9318,7 +9318,7 @@ ...@@ -9318,7 +9318,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9336,7 +9336,7 @@ ...@@ -9336,7 +9336,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9354,7 +9354,7 @@ ...@@ -9354,7 +9354,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9372,7 +9372,7 @@ ...@@ -9372,7 +9372,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9390,7 +9390,7 @@ ...@@ -9390,7 +9390,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9408,7 +9408,7 @@ ...@@ -9408,7 +9408,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9426,7 +9426,7 @@ ...@@ -9426,7 +9426,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9444,7 +9444,7 @@ ...@@ -9444,7 +9444,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9462,7 +9462,7 @@ ...@@ -9462,7 +9462,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9480,7 +9480,7 @@ ...@@ -9480,7 +9480,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9498,7 +9498,7 @@ ...@@ -9498,7 +9498,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9516,7 +9516,7 @@ ...@@ -9516,7 +9516,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9534,7 +9534,7 @@ ...@@ -9534,7 +9534,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9552,7 +9552,7 @@ ...@@ -9552,7 +9552,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9570,7 +9570,7 @@ ...@@ -9570,7 +9570,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9588,7 +9588,7 @@ ...@@ -9588,7 +9588,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9606,7 +9606,7 @@ ...@@ -9606,7 +9606,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9624,7 +9624,7 @@ ...@@ -9624,7 +9624,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9642,7 +9642,7 @@ ...@@ -9642,7 +9642,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9660,7 +9660,7 @@ ...@@ -9660,7 +9660,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9678,7 +9678,7 @@ ...@@ -9678,7 +9678,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9696,7 +9696,7 @@ ...@@ -9696,7 +9696,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9714,7 +9714,7 @@ ...@@ -9714,7 +9714,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9732,7 +9732,7 @@ ...@@ -9732,7 +9732,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9750,7 +9750,7 @@ ...@@ -9750,7 +9750,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9768,7 +9768,7 @@ ...@@ -9768,7 +9768,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9786,7 +9786,7 @@ ...@@ -9786,7 +9786,7 @@
}, },
{ {
"args": [ "args": [
"--enable-blink-features=HeapConcurrentMarking" "--enable-features=BlinkHeapConcurrentMarking"
], ],
"merge": { "merge": {
"args": [], "args": [],
...@@ -9808,7 +9808,7 @@ ...@@ -9808,7 +9808,7 @@
"args": [ "args": [
"--num-retries=3", "--num-retries=3",
"--release", "--release",
"--additional-driver-flag=--enable-blink-features=HeapConcurrentMarking" "--additional-driver-flag=--enable-features=BlinkHeapConcurrentMarking"
], ],
"isolate_name": "blink_web_tests_exparchive", "isolate_name": "blink_web_tests_exparchive",
"merge": { "merge": {
......
...@@ -1771,7 +1771,7 @@ ...@@ -1771,7 +1771,7 @@
'linux-blink-heap-concurrent-marking-tsan-rel': { 'linux-blink-heap-concurrent-marking-tsan-rel': {
'args': [ 'args': [
'--release', '--release',
'--additional-driver-flag=--enable-blink-features=HeapConcurrentMarking', '--additional-driver-flag=--enable-features=BlinkHeapConcurrentMarking',
], ],
}, },
'linux-blink-heap-unified-gc': { 'linux-blink-heap-unified-gc': {
......
...@@ -1741,7 +1741,7 @@ ...@@ -1741,7 +1741,7 @@
'isolated_scripts': 'chromium_webkit_isolated_scripts', 'isolated_scripts': 'chromium_webkit_isolated_scripts',
}, },
'gtest_args': [ 'gtest_args': [
'--enable-blink-features=HeapConcurrentMarking', '--enable-features=BlinkHeapConcurrentMarking',
] ]
}, },
'linux-blink-heap-unified-gc': { 'linux-blink-heap-unified-gc': {
......
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