Merge "Show less ambiguous paths in the error when it fails to match the given output file." (bacf6a1a) · Commits · e / os / android_build_soong

android/testing.go

+10 −3

Original line number	Diff line number	Diff line
		@@ -808,7 +808,7 @@ func (b baseTestingComponent) buildParamsFromDescription(desc string) TestingBui
		}

		func (b baseTestingComponent) maybeBuildParamsFromOutput(file string) (TestingBuildParams, []string) {
		var searchedOutputs []string
		searchedOutputs := WritablePaths(nil)
		for _, p := range b.provider.BuildParamsForTests() {
		outputs := append(WritablePaths(nil), p.Outputs...)
		outputs = append(outputs, p.ImplicitOutputs...)
		@@ -819,10 +819,17 @@ func (b baseTestingComponent) maybeBuildParamsFromOutput(file string) (TestingBu
		if f.String() == file \|\| f.Rel() == file \|\| PathRelativeToTop(f) == file {
		return b.newTestingBuildParams(p), nil
		}
		searchedOutputs = append(searchedOutputs, f.Rel())
		searchedOutputs = append(searchedOutputs, f)
		}
		}
		return TestingBuildParams{}, searchedOutputs

		formattedOutputs := []string{}
		for _, f := range searchedOutputs {
		formattedOutputs = append(formattedOutputs,
		fmt.Sprintf("%s (rel=%s)", PathRelativeToTop(f), f.Rel()))
		}

		return TestingBuildParams{}, formattedOutputs
		}

		func (b baseTestingComponent) buildParamsFromOutput(file string) TestingBuildParams {