diff options
| author | 2025-02-12 22:42:20 -0800 | |
|---|---|---|
| committer | 2025-02-12 22:42:20 -0800 | |
| commit | a17496cb5d6effeb341f6b95acd5a4d4735642bf (patch) | |
| tree | 051c99c1fae6383de4b5d2785dbb7a00dd3571c3 /android/makevars_test.go | |
| parent | 852f109a206ccc5fdd869de833a97e0d1b9a09a2 (diff) | |
| parent | 8ea2abcb0ff0f2e23391dbde621d62c0980138e7 (diff) | |
Merge "Don't panic in ModuleForTests and friends" into main am: 4a80748e09 am: 8ea2abcb0f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3490133
Change-Id: If401bc7e4ed94f982391e49aa059015cbaecca5f
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) |