Support tests build using goma.

This commit is contained in:
Aleksey Khoroshilov
2022-01-21 14:28:08 +07:00
parent aa5d2d8cde
commit 40850b7c07
6 changed files with 13 additions and 5 deletions
+1
View File
@@ -132,6 +132,7 @@ const build = (buildConfig = config.defaultBuildConfig, options) => {
if (config.xcode_gen_target) {
util.generateXcodeWorkspace()
} else {
util.generateNinjaFiles()
util.buildTarget()
}
}
+1
View File
@@ -26,6 +26,7 @@ const createDist = (buildConfig = config.defaultBuildConfig, options) => {
}
}
config.buildTarget = 'create_dist'
util.generateNinjaFiles()
util.buildTarget()
}
+3 -2
View File
@@ -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"), [
+6 -2
View File
@@ -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)
+1 -1
View File
@@ -20,4 +20,4 @@ let ninjaOpts = [
'-C', outputDir, 'brave:audit_deps',
...config.extraNinjaOpts
]
util.run('ninja', ninjaOpts, options)
util.run('autoninja', ninjaOpts, options)
+1
View File
@@ -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))