Index: tools/roll_webgl_conformance.py |
diff --git a/tools/roll_webgl_conformance.py b/tools/roll_webgl_conformance.py |
index 7ea056f1f5092f0638be1d7c82c4f64444faa3b0..4c9eb73d641e373d7c8df01bb641702f0210c4a4 100755 |
--- a/tools/roll_webgl_conformance.py |
+++ b/tools/roll_webgl_conformance.py |
@@ -20,7 +20,11 @@ extra_trybots = [ |
{ |
"mastername": "tryserver.chromium.mac", |
"buildernames": ["mac_optional_gpu_tests_rel"] |
- } |
+ }, |
+ { |
+ "mastername": "tryserver.chromium.linux", |
+ "buildernames": ["linux_optional_gpu_tests_rel"] |
+ }, |
] |
SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__)) |
@@ -229,7 +233,7 @@ class AutoRoller(object): |
readme.write(m) |
readme.truncate() |
- def PrepareRoll(self, ignore_checks, skip_tryjobs): |
+ def PrepareRoll(self, ignore_checks, run_tryjobs): |
# TODO(kjellander): use os.path.normcase, os.path.join etc for all paths for |
# cross platform compatibility. |
@@ -280,7 +284,7 @@ class AutoRoller(object): |
self._RunCommand(['git', 'cl', 'upload'], |
extra_env={'EDITOR': 'true'}) |
- if not skip_tryjobs: |
+ if run_tryjobs: |
# Kick off tryjobs. |
base_try_cmd = ['git', 'cl', 'try'] |
self._RunCommand(base_try_cmd) |
@@ -365,11 +369,10 @@ def main(): |
help=('Skips checks for being on the master branch, dirty workspaces and ' |
'the updating of the checkout. Will still delete and create local ' |
'Git branches.')) |
- parser.add_argument('--skip-tryjobs', action='store_true', default=False, |
- help=('Skip the dry-run tryjobs for the newly generated CL. Use this ' |
- 'when you expect to have to make many changes to the WebGL ' |
- 'conformance test expectations in the same CL and want to avoid ' |
- 'wasted tryjobs.')) |
+ parser.add_argument('--run-tryjobs', action='store_true', default=False, |
+ help=('Start the dry-run tryjobs for the newly generated CL. Use this ' |
+ 'when you have no need to make changes to the WebGL conformance ' |
+ 'test expectations in the same CL and want to avoid.')) |
parser.add_argument('-v', '--verbose', action='store_true', default=False, |
help='Be extra verbose in printing of log messages.') |
args = parser.parse_args() |
@@ -383,7 +386,7 @@ def main(): |
if args.abort: |
return autoroller.Abort() |
else: |
- return autoroller.PrepareRoll(args.ignore_checks, args.skip_tryjobs) |
+ return autoroller.PrepareRoll(args.ignore_checks, args.run_tryjobs) |
if __name__ == '__main__': |
sys.exit(main()) |