Remove UseValidationsForGoTests. am: d9d298c760
am: f16d2de6d0
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1821772 Change-Id: I88d9f5ddb58af4b50ffb5c4ed6d7a2296c3c268d
This commit is contained in:
commit
06844fc461
2 changed files with 2 additions and 21 deletions
|
@ -466,19 +466,11 @@ func (g *goBinary) GenerateBuildActions(ctx blueprint.ModuleContext) {
|
|||
Optional: true,
|
||||
})
|
||||
|
||||
var orderOnlyDeps, validationDeps []string
|
||||
if ctx.Config().(BootstrapConfig).UseValidationsForGoTests() {
|
||||
validationDeps = testDeps
|
||||
} else {
|
||||
orderOnlyDeps = testDeps
|
||||
}
|
||||
|
||||
ctx.Build(pctx, blueprint.BuildParams{
|
||||
Rule: cp,
|
||||
Outputs: []string{g.installPath},
|
||||
Inputs: []string{aoutFile},
|
||||
OrderOnly: orderOnlyDeps,
|
||||
Validations: validationDeps,
|
||||
Validations: testDeps,
|
||||
Optional: !g.properties.Default,
|
||||
})
|
||||
}
|
||||
|
@ -606,19 +598,11 @@ func buildGoTest(ctx blueprint.ModuleContext, testRoot, testPkgArchive,
|
|||
Optional: true,
|
||||
})
|
||||
|
||||
var orderOnlyDeps, validationDeps []string
|
||||
if ctx.Config().(BootstrapConfig).UseValidationsForGoTests() {
|
||||
validationDeps = testDeps
|
||||
} else {
|
||||
orderOnlyDeps = testDeps
|
||||
}
|
||||
|
||||
ctx.Build(pctx, blueprint.BuildParams{
|
||||
Rule: test,
|
||||
Outputs: []string{testPassed},
|
||||
Inputs: []string{testFile},
|
||||
OrderOnly: orderOnlyDeps,
|
||||
Validations: validationDeps,
|
||||
Validations: testDeps,
|
||||
Args: map[string]string{
|
||||
"pkg": pkgPath,
|
||||
"pkgSrcDir": filepath.Dir(testFiles[0]),
|
||||
|
|
|
@ -92,9 +92,6 @@ type BootstrapConfig interface {
|
|||
// Whether to run tests for Go code
|
||||
RunGoTests() bool
|
||||
|
||||
// Whether to use Ninja validations for running Go tests
|
||||
UseValidationsForGoTests() bool
|
||||
|
||||
Subninjas() []string
|
||||
PrimaryBuilderInvocations() []PrimaryBuilderInvocation
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue