diff options
| author | 2025-02-12 22:16:51 -0800 | |
|---|---|---|
| committer | 2025-02-12 22:16:51 -0800 | |
| commit | 8ea2abcb0ff0f2e23391dbde621d62c0980138e7 (patch) | |
| tree | 4d421d8fcaea1914cf782421676fbb0da48af277 /android/makevars_test.go | |
| parent | 421ced81177c558d9b03c958cc78493874e27a25 (diff) | |
| parent | 4a80748e09ff307c3052fbb36ac38880fd5d2340 (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/makevars_test.go')
| -rw-r--r-- | android/makevars_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/makevars_test.go b/android/makevars_test.go index 95e4b59c2..387d45759 100644 --- a/android/makevars_test.go +++ b/android/makevars_test.go @@ -23,7 +23,7 @@ func TestDistFilesInGenerateAndroidBuildActions(t *testing.T) { } `) - lateContents := string(result.SingletonForTests("makevars").Singleton().(*makeVarsSingleton).lateForTesting) + lateContents := string(result.SingletonForTests(t, "makevars").Singleton().(*makeVarsSingleton).lateForTesting) matched, err := regexp.MatchString(`call dist-for-goals,my_goal,.*/my_file.txt:my_file.txt\)`, lateContents) if err != nil || !matched { t.Fatalf("Expected a dist of my_file.txt, but got: %s", lateContents) |