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

Merge "Add TestingModule.Outputs" am: b2786a3fdc

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

Change-Id: Iecb33e587aa8f93552849537d34928b7b976fbdb
This commit is contained in:
Paul Duffin
2021-03-30 17:46:55 +00:00
committed by Automerger Merge Worker
parent 3fa9946ca6 b2786a3fdc
commit 2f57a16255
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android/testing.go
View File

@@ -816,6 +816,22 @@ func (m TestingModule) VariablesForTestsRelativeToTop() map[string]string {
return normalizeStringMapRelativeToTop(m.config, m.module.VariablesForTests()) return normalizeStringMapRelativeToTop(m.config, m.module.VariablesForTests())
} }
// OutputFiles calls OutputFileProducer.OutputFiles on the encapsulated module, exits the test
// immediately if there is an error and otherwise returns the result of calling Paths.RelativeToTop
// on the returned Paths.
func (m TestingModule) OutputFiles(t *testing.T, tag string) Paths {
producer, ok := m.module.(OutputFileProducer)
if !ok {
t.Fatalf("%q must implement OutputFileProducer\n", m.module.Name())
}
paths, err := producer.OutputFiles(tag)
if err != nil {
t.Fatal(err)
}
return paths.RelativeToTop()
}
// TestingSingleton is wrapper around an android.Singleton that provides methods to find information about individual // TestingSingleton is wrapper around an android.Singleton that provides methods to find information about individual
// ctx.Build parameters for verification in tests. // ctx.Build parameters for verification in tests.
type TestingSingleton struct { type TestingSingleton struct {