StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable Soong tests by default on Linux" into main am: c2d3ffcae3 am: 0d7e5708bf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802174

Change-Id: I7bdde824220fbf53401c9f246b5a2c25af929672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2023-10-24 23:00:10 +00:00
committed by Automerger Merge Worker
parent 857219672f 0d7e5708bf
commit f3b40d992e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ui/build/config.go
View File

@@ -240,6 +240,11 @@ func NewConfig(ctx Context, args ...string) Config {
ninjaWeightListSource: DEFAULT, ninjaWeightListSource: DEFAULT,
} }
// Skip soong tests by default on Linux
if runtime.GOOS == "linux" {
ret.skipSoongTests = true
}
// Default matching ninja // Default matching ninja
ret.parallel = runtime.NumCPU() + 2 ret.parallel = runtime.NumCPU() + 2
ret.keepGoing = 1 ret.keepGoing = 1
@@ -772,6 +777,8 @@ func (c *configImpl) parseArgs(ctx Context, args []string) {
c.skipConfig = true c.skipConfig = true
} else if arg == "--skip-soong-tests" { } else if arg == "--skip-soong-tests" {
c.skipSoongTests = true c.skipSoongTests = true
} else if arg == "--no-skip-soong-tests" {
c.skipSoongTests = false
} else if arg == "--skip-metrics-upload" { } else if arg == "--skip-metrics-upload" {
c.skipMetricsUpload = true c.skipMetricsUpload = true
} else if arg == "--mk-metrics" { } else if arg == "--mk-metrics" {