diff options
| author | 2025-02-12 22:42:20 -0800 | |
|---|---|---|
| committer | 2025-02-12 22:42:20 -0800 | |
| commit | a17496cb5d6effeb341f6b95acd5a4d4735642bf (patch) | |
| tree | 051c99c1fae6383de4b5d2785dbb7a00dd3571c3 /xml/xml_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 'xml/xml_test.go')
| -rw-r--r-- | xml/xml_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xml/xml_test.go b/xml/xml_test.go index 9f28315b7..212b0c5af 100644 --- a/xml/xml_test.go +++ b/xml/xml_test.go @@ -71,7 +71,7 @@ func TestPrebuiltEtcXml(t *testing.T) { {rule: "xmllint-minimal", input: "baz.xml"}, } { t.Run(tc.schemaType, func(t *testing.T) { - rule := result.ModuleForTests(tc.input, "android_arm64_armv8-a").Rule(tc.rule) + rule := result.ModuleForTests(t, tc.input, "android_arm64_armv8-a").Rule(tc.rule) android.AssertStringEquals(t, "input", tc.input, rule.Input.String()) if tc.schemaType != "" { android.AssertStringEquals(t, "schema", tc.schema, rule.Args[tc.schemaType]) @@ -79,6 +79,6 @@ func TestPrebuiltEtcXml(t *testing.T) { }) } - m := result.ModuleForTests("foo.xml", "android_arm64_armv8-a").Module().(*prebuiltEtcXml) + m := result.ModuleForTests(t, "foo.xml", "android_arm64_armv8-a").Module().(*prebuiltEtcXml) android.AssertPathRelativeToTopEquals(t, "installDir", "out/target/product/test_device/system/etc", m.InstallDirPath()) } |