Merge "Disable Soong tests by default on Linux" into main
This commit is contained in:
@@ -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" {
|
||||||
|
Reference in New Issue
Block a user