summaryrefslogtreecommitdiff
path: root/rust
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2025-03-11 15:55:59 -0700
committer Cole Faust <colefaust@google.com> 2025-03-11 15:55:59 -0700
commit5e1454aef7f1e97890b11db5c85b7655ce8f7380 (patch)
tree9feac0470368a38e98ebec8ec9a7475594353c0c /rust
parent7ed094ef25e59df953b422f011eaac8bb1c1eba1 (diff)
Expand TestSuiteInfoProvider to all test modules
Test suites have been historically only defined in the AndroidMk functions. But in soong-only builds, we don't run AndroidMk. It appears Colin already started making a TestSuiteInfo provider, but hadn't set it on all test modules yet. Expand it to all the test modules, and add export it to make so that make can check that it matches LOCAL_COMPATIBILITY_SUITES. Bug: 388850000 Test: m nothing Change-Id: Iee8959742117604fd560c95be60f3cb7cf3d9ae4
Diffstat (limited to 'rust')
-rw-r--r--rust/benchmark.go4
-rw-r--r--rust/test.go4
2 files changed, 8 insertions, 0 deletions
diff --git a/rust/benchmark.go b/rust/benchmark.go
index daba9642e..3aa2f1779 100644
--- a/rust/benchmark.go
+++ b/rust/benchmark.go
@@ -146,4 +146,8 @@ func (benchmark *benchmarkDecorator) moduleInfoJSON(ctx ModuleContext, moduleInf
} else {
moduleInfoJSON.CompatibilitySuites = append(moduleInfoJSON.CompatibilitySuites, "null-suite")
}
+
+ android.SetProvider(ctx, android.TestSuiteInfoProvider, android.TestSuiteInfo{
+ TestSuites: benchmark.Properties.Test_suites,
+ })
}
diff --git a/rust/test.go b/rust/test.go
index 9cbc9f414..2fed0d62e 100644
--- a/rust/test.go
+++ b/rust/test.go
@@ -320,6 +320,10 @@ func (test *testDecorator) moduleInfoJSON(ctx ModuleContext, moduleInfoJSON *and
} else {
moduleInfoJSON.CompatibilitySuites = append(moduleInfoJSON.CompatibilitySuites, "null-suite")
}
+
+ android.SetProvider(ctx, android.TestSuiteInfoProvider, android.TestSuiteInfo{
+ TestSuites: test.Properties.Test_suites,
+ })
}
func rustTestHostMultilib(ctx android.LoadHookContext) {