summaryrefslogtreecommitdiff
path: root/android/namespace_test.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2025-02-12 22:16:51 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-12 22:16:51 -0800
commit8ea2abcb0ff0f2e23391dbde621d62c0980138e7 (patch)
tree4d421d8fcaea1914cf782421676fbb0da48af277 /android/namespace_test.go
parent421ced81177c558d9b03c958cc78493874e27a25 (diff)
parent4a80748e09ff307c3052fbb36ac38880fd5d2340 (diff)
Merge "Don't panic in ModuleForTests and friends" into main am: 4a80748e09
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3490133 Change-Id: I2057f531f5d40d61410ce97547d04b6840c4e800 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'android/namespace_test.go')
-rw-r--r--android/namespace_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/namespace_test.go b/android/namespace_test.go
index 0327e7824..a183bbf0d 100644
--- a/android/namespace_test.go
+++ b/android/namespace_test.go
@@ -683,7 +683,7 @@ func numDeps(result *TestResult, module TestingModule) int {
}
func getModule(result *TestResult, moduleName string) TestingModule {
- return result.ModuleForTests(moduleName, "")
+ return result.ModuleForTests(result.fixture.t, moduleName, "")
}
func findModuleById(result *TestResult, id string) (module TestingModule) {
@@ -691,7 +691,7 @@ func findModuleById(result *TestResult, id string) (module TestingModule) {
testModule, ok := candidate.(*testModule)
if ok {
if testModule.properties.Id == id {
- module = newTestingModule(result.config, testModule)
+ module = newTestingModule(result.fixture.t, result.config, testModule)
}
}
}