Support tests build using goma.
This commit is contained in:
@@ -132,6 +132,7 @@ const build = (buildConfig = config.defaultBuildConfig, options) => {
|
||||
if (config.xcode_gen_target) {
|
||||
util.generateXcodeWorkspace()
|
||||
} else {
|
||||
util.generateNinjaFiles()
|
||||
util.buildTarget()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ const createDist = (buildConfig = config.defaultBuildConfig, options) => {
|
||||
}
|
||||
}
|
||||
config.buildTarget = 'create_dist'
|
||||
util.generateNinjaFiles()
|
||||
util.buildTarget()
|
||||
}
|
||||
|
||||
|
||||
@@ -70,10 +70,11 @@ const test = (passthroughArgs, suite, buildConfig = config.defaultBuildConfig, o
|
||||
'brave_network_audit_tests',
|
||||
]
|
||||
if (testSuites.includes(suite)) {
|
||||
util.run('ninja', ['-C', config.outputDir, "brave/test:" + suite], config.defaultOptions)
|
||||
config.buildTarget = 'brave/test:' + suite
|
||||
} else {
|
||||
util.run('ninja', ['-C', config.outputDir, suite], config.defaultOptions)
|
||||
config.buildTarget = suite
|
||||
}
|
||||
util.buildTarget()
|
||||
|
||||
if (config.targetOS === 'ios') {
|
||||
util.run(path.join(config.outputDir, "iossim"), [
|
||||
|
||||
@@ -559,14 +559,18 @@ const util = {
|
||||
}
|
||||
},
|
||||
|
||||
buildTarget: (options = config.defaultOptions) => {
|
||||
console.log('building ' + config.buildTarget + '...')
|
||||
generateNinjaFiles: (options = config.defaultOptions) => {
|
||||
console.log('generating ninja files...')
|
||||
|
||||
if (process.platform === 'win32') {
|
||||
util.updateOmahaMidlFiles()
|
||||
util.buildRedirectCCTool()
|
||||
}
|
||||
util.runGnGen(options)
|
||||
},
|
||||
|
||||
buildTarget: (options = config.defaultOptions) => {
|
||||
console.log('building ' + config.buildTarget + '...')
|
||||
|
||||
let num_compile_failure = 1
|
||||
if (config.ignore_compile_failure)
|
||||
|
||||
@@ -20,4 +20,4 @@ let ninjaOpts = [
|
||||
'-C', outputDir, 'brave:audit_deps',
|
||||
...config.extraNinjaOpts
|
||||
]
|
||||
util.run('ninja', ninjaOpts, options)
|
||||
util.run('autoninja', ninjaOpts, options)
|
||||
|
||||
@@ -236,6 +236,7 @@ program
|
||||
.option('--target_arch <target_arch>', 'target architecture')
|
||||
.option('--run_disabled_tests', 'run disabled tests')
|
||||
.option('--manual_android_test_device', 'indicates that Android test device is run manually')
|
||||
.option('--use_goma', 'whether to use Goma for building')
|
||||
.arguments('[build_config]')
|
||||
.action(test.bind(null, parsedArgs.unknown))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user