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

Merge "Add another way for TestingModule to get its output files" into main

Browse Source
This commit is contained in:
Zi Wang
2024-06-14 22:14:59 +00:00
committed by Gerrit Code Review
parent 52436e1574 e81e77a2b1
commit f222db3d01
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/testing.go
View File

@@ -1014,10 +1014,18 @@ 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 // OutputFiles first checks if module base outputFiles property has any output
// immediately if there is an error and otherwise returns the result of calling Paths.RelativeToTop // files can be used to return.
// If not, it 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. // on the returned Paths.
func (m TestingModule) OutputFiles(t *testing.T, tag string) Paths { func (m TestingModule) OutputFiles(t *testing.T, tag string) Paths {
// TODO: add non-empty-string tag case and remove OutputFileProducer part
if tag == "" && m.module.base().outputFiles.DefaultOutputFiles != nil {
return m.module.base().outputFiles.DefaultOutputFiles.RelativeToTop()
}
producer, ok := m.module.(OutputFileProducer) producer, ok := m.module.(OutputFileProducer)
if !ok { if !ok {
t.Fatalf("%q must implement OutputFileProducer\n", m.module.Name()) t.Fatalf("%q must implement OutputFileProducer\n", m.module.Name())