Index: testing/buildbot/gn_isolate_map.pyl |
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl |
index 791e09fa526448ec6da25e079af8aeeb0592cbb7..6fffc60790b1fc1818c1579565443ffc8db7f21a 100644 |
--- a/testing/buildbot/gn_isolate_map.pyl |
+++ b/testing/buildbot/gn_isolate_map.pyl |
@@ -11,26 +11,54 @@ |
# much always the same as the Ninja target name, since GYP target names are not |
# hierarchical). |
# |
-# The 'type' field is used to determine what the command line for the test |
+# The "label" field specifies the matching GN label for the given ninja |
+# target. |
+# |
+# The "type" field is used to determine what the command line for the test |
# needs to be; valid values are: |
# |
-# "windowed_test_launcher" |
-# : the test is a gtest-based test that uses the 'brave-new-test-launcher' |
-# from //base/test:test_support and needs to run under Xvfb if run on |
-# an X11-based platform (use_x11=true). |
+# "windowed_test_launcher" |
+# : the test is a gtest-based test that uses the "brave-new-test-launcher" |
+# from //base/test:test_support and needs to run under Xvfb if run on |
+# an X11-based platform (use_x11=true). |
# "console_test_launcher" |
-# : the test is a gtest-based test that uses the 'brave-new-test-launcher' |
+# : the test is a gtest-based test that uses the "brave-new-test-launcher" |
# from //base/test:test_support but does not need Xvfb. |
# "gpu_browser_test" |
# : the test is a subset of the browser_tests that will be run against |
# a real GPU. |
# "raw" |
# : the test is a standalone executable; it may take an optional list of |
-# command line arguments in the 'args' field, but otherwise needs no |
+# command line arguments in the "args" field, but otherwise needs no |
# extra files or special handling. |
+# "script" |
+# : the test is a python script; the path to the script is specified in |
+# the "script" field. |
# "unknown" |
# : (the default), which indicates that we don't know what the command line |
# needs to be (this is a fatal error). |
+# |
+# The optional "executable" field can be used to override the name |
+# of the binary to run. If the field is not specified, the binary |
+# name will be assumed to be the same as the ninja build target name. |
+# On Windows, ".exe" will be automatically appended if need be, so |
+# the executable name (and target name) should not contain an ".exe". |
+# |
+# The optional "args" field can be used to append extra command line |
+# args onto the command line determined by the "type". If not specified, |
+# it defaults to an empty list (no extra args). |
+# |
+# The optional "label_type" field can be used in conjunction with |
+# "type" == "console_test_launcher" or "type" == "windowed_test_launcher" |
+# to indicate that even though the command line |
+# to use follows the test_launcher patterns, the actual GN label refers |
+# to a different type of thing (usually a "group") and so MB can find |
+# the generated runtime files in the right place. This is used, for |
+# example, in content_site_isolation_browsertests . |
+# |
+# The optional "script" field is used when "type" == "script", and |
+# specifies the GN path to the corresponding python file, e.g. |
+# "//testing/scripts/foo.py". |
{ |
"accessibility_unittests": { |
@@ -165,6 +193,13 @@ |
"type": "raw", |
"args": [], |
}, |
+ "content_site_isolation_browsertests": { |
+ "label": "//content/test:content_site_isolation_browsertests", |
+ "label_type": "group", |
+ "type": "windowed_test_launcher", |
+ "executable": "content_browsertests", |
+ "args": ["--site-per-process", "--test-launcher-filter-file=../../testing/buildbot/filters/site-per-process.content_browsertests.filter"], |
+ }, |
"content_unittests": { |
"label": "//content/test:content_unittests", |
"type": "windowed_test_launcher", |