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

Make TestingBuildParams.RelativeToTop() modify (Writable)Path(s)

Browse Source 
Bug: 183650682
Test: m droid
Change-Id: I5cb150aa28cf1a06c353b67443fd2128aff4bb5d
This commit is contained in:
Paul Duffin
2021-03-24 10:34:52 +00:00
parent 6c968b1f0f
commit bbb0f8fae4
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
android/testing.go
View File

@@ -539,8 +539,7 @@ type TestingBuildParams struct {
// The parts of this structure which are changed are: // The parts of this structure which are changed are:
// * BuildParams // * BuildParams
// * Args // * Args
// * Path instances are intentionally not modified, use AssertPathRelativeToTopEquals or // * All Path, Paths, WritablePath and WritablePaths fields.
// AssertPathsRelativeToTopEquals instead which do something similar.
// //
// * RuleParams // * RuleParams
// * Command // * Command
@@ -564,6 +563,20 @@ func (p TestingBuildParams) RelativeToTop() TestingBuildParams {
// Take a copy of the build params and replace any args that contains test specific temporary // Take a copy of the build params and replace any args that contains test specific temporary
// paths with paths relative to the top. // paths with paths relative to the top.
bparams := p.BuildParams bparams := p.BuildParams
bparams.Depfile = normalizeWritablePathRelativeToTop(bparams.Depfile)
bparams.Output = normalizeWritablePathRelativeToTop(bparams.Output)
bparams.Outputs = bparams.Outputs.RelativeToTop()
bparams.SymlinkOutput = normalizeWritablePathRelativeToTop(bparams.SymlinkOutput)
bparams.SymlinkOutputs = bparams.SymlinkOutputs.RelativeToTop()
bparams.ImplicitOutput = normalizeWritablePathRelativeToTop(bparams.ImplicitOutput)
bparams.ImplicitOutputs = bparams.ImplicitOutputs.RelativeToTop()
bparams.Input = normalizePathRelativeToTop(bparams.Input)
bparams.Inputs = bparams.Inputs.RelativeToTop()
bparams.Implicit = normalizePathRelativeToTop(bparams.Implicit)
bparams.Implicits = bparams.Implicits.RelativeToTop()
bparams.OrderOnly = bparams.OrderOnly.RelativeToTop()
bparams.Validation = normalizePathRelativeToTop(bparams.Validation)
bparams.Validations = bparams.Validations.RelativeToTop()
bparams.Args = normalizeStringMapRelativeToTop(p.config, bparams.Args) bparams.Args = normalizeStringMapRelativeToTop(p.config, bparams.Args)
// Ditto for any fields in the RuleParams. // Ditto for any fields in the RuleParams.
@@ -582,6 +595,20 @@ func (p TestingBuildParams) RelativeToTop() TestingBuildParams {
} }
} }
func normalizeWritablePathRelativeToTop(path WritablePath) WritablePath {
if path == nil {
return nil
}
return path.RelativeToTop().(WritablePath)
}
func normalizePathRelativeToTop(path Path) Path {
if path == nil {
return nil
}
return path.RelativeToTop()
}
// baseTestingComponent provides functionality common to both TestingModule and TestingSingleton. // baseTestingComponent provides functionality common to both TestingModule and TestingSingleton.
type baseTestingComponent struct { type baseTestingComponent struct {
config Config config Config