Commit 7edb74ba authored by dpranke's avatar dpranke Committed by Commit bot

Add script tests for `gn check`, `gyp_flag_compare` to GN bot configs.

This adds the tests on the GN bots that are currently configured
recipe-side in the chromium_gn recipe to //testing/scripts, so
that they can be configured repo-side and we will need to modify
the recipe less often.

R=phajdan.jr@chromium.org
BUG=481693

Review URL: https://codereview.chromium.org/1145513005

Cr-Commit-Position: refs/heads/master@{#330862}
parent 7c43b096
...@@ -3,6 +3,12 @@ ...@@ -3,6 +3,12 @@
"additional_compile_targets": [ "additional_compile_targets": [
"chrome_shell_apk", "chrome_shell_apk",
"mandoline:all" "mandoline:all"
],
"scripts": [
{
"name": "gn_check",
"script": "gn_check.py"
}
] ]
}, },
"Android GN (dbg)": { "Android GN (dbg)": {
...@@ -364,6 +370,19 @@ ...@@ -364,6 +370,19 @@
{ {
"test": "wm_unittests" "test": "wm_unittests"
} }
],
"scripts": [
{
"name": "gn_check",
"script": "gn_check.py"
},
{
"args": [
"chrome"
],
"name": "gyp_flag_compare",
"script": "gyp_flag_compare.py"
}
] ]
}, },
"Linux GN (dbg)": { "Linux GN (dbg)": {
......
...@@ -11,7 +11,13 @@ ...@@ -11,7 +11,13 @@
"chrome_shell_apk", "chrome_shell_apk",
"mandoline:all" "mandoline:all"
], ],
"gtest_tests": [] "gtest_tests": [],
"scripts": [
{
"name": "gn_check",
"script": "gn_check.py"
}
]
}, },
"linux_chromium_gn_chromeos_dbg": { "linux_chromium_gn_chromeos_dbg": {
"additional_compile_targets": [ "additional_compile_targets": [
...@@ -352,6 +358,19 @@ ...@@ -352,6 +358,19 @@
{ {
"test": "wm_unittests" "test": "wm_unittests"
} }
],
"scripts": [
{
"name": "gn_check",
"script": "gn_check.py"
},
{
"args": [
"chrome"
],
"name": "gyp_flag_compare",
"script": "gyp_flag_compare.py"
}
] ]
} }
} }
#!/usr/bin/env python
# Copyright 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Wrap `gn check` for the bots.
This script wraps the `gn check` command in the facade needed for the
'ScriptTest' step class of the chromium recipe_module
(see scripts/slave/recipe_modules/chromium/steps.py in the build repo).
The script takes no arguments.
"""
import json
import os
import sys
import common
def main_run(args):
if sys.platform == 'win32':
exe = os.path.join(common.SRC_DIR, 'buildtools', 'win', 'gn.exe')
elif sys.platform == 'mac':
exe = os.path.join(common.SRC_DIR, 'buildtools', 'mac', 'gn')
else:
exe = os.path.join(common.SRC_DIR, 'buildtools', 'linux64', 'gn')
rc = common.run_command([
exe,
'--root=%s' % common.SRC_DIR,
'check',
'//out/%s' % args.build_config_fs,
])
# TODO(dpranke): Figure out how to get a list of failures out of gn check?
json.dump({
'valid': True,
'failures': ['check_failed'] if rc else [],
}, args.output)
return rc
def main_compile_targets(args):
json.dump([], args.output)
if __name__ == '__main__':
funcs = {
'run': main_run,
'compile_targets': main_compile_targets,
}
sys.exit(common.run_script(sys.argv[1:], funcs))
#!/usr/bin/env python
# Copyright 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Wrap //tools/gn/bin/gyp_flag_compare.py for the bots.
This script wraps the GN test script in the facade needed for the
'ScriptTest' step class of the chromium recipe_module
(see scripts/slave/recipe_modules/chromium/steps.py in the build repo.
The script takes N arguments, for the N targets to compare flags for.
"""
import json
import os
import sys
import common
def main_run(args):
rc = common.run_command([sys.executable,
os.path.join(common.SRC_DIR,
'tools', 'gn', 'bin',
'gyp_flag_compare.py')] + args.args)
# TODO(dpranke): Figure out how to get a list of failures out of
# gyp_flag_compare?
json.dump({
'valid': True,
'failures': ['compare_failed'] if rc else [],
}, args.output)
return rc
def main_compile_targets(args):
# TODO(dpranke): Figure out how to get args.args plumbed through to here.
json.dump([], args.output)
if __name__ == '__main__':
funcs = {
'run': main_run,
'compile_targets': main_compile_targets,
}
sys.exit(common.run_script(sys.argv[1:], funcs))
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