diff options
author | 2025-02-12 22:42:20 -0800 | |
---|---|---|
committer | 2025-02-12 22:42:20 -0800 | |
commit | a17496cb5d6effeb341f6b95acd5a4d4735642bf (patch) | |
tree | 051c99c1fae6383de4b5d2785dbb7a00dd3571c3 /rust/clippy_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 'rust/clippy_test.go')
-rw-r--r-- | rust/clippy_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rust/clippy_test.go b/rust/clippy_test.go index bd3bfb151..3563348ea 100644 --- a/rust/clippy_test.go +++ b/rust/clippy_test.go @@ -62,13 +62,13 @@ func TestClippy(t *testing.T) { android.FixtureAddTextFile(tc.modulePath+"Android.bp", bp), ).RunTest(t) - r := result.ModuleForTests("libfoo", "android_arm64_armv8-a_dylib").MaybeRule("clippy") + r := result.ModuleForTests(t, "libfoo", "android_arm64_armv8-a_dylib").MaybeRule("clippy") android.AssertStringEquals(t, "libfoo flags", tc.fooFlags, r.Args["clippyFlags"]) - r = result.ModuleForTests("libbar", "android_arm64_armv8-a_dylib").MaybeRule("clippy") + r = result.ModuleForTests(t, "libbar", "android_arm64_armv8-a_dylib").MaybeRule("clippy") android.AssertStringEquals(t, "libbar flags", "${config.ClippyDefaultLints}", r.Args["clippyFlags"]) - r = result.ModuleForTests("libfoobar", "android_arm64_armv8-a_dylib").MaybeRule("clippy") + r = result.ModuleForTests(t, "libfoobar", "android_arm64_armv8-a_dylib").MaybeRule("clippy") if r.Rule != nil { t.Errorf("libfoobar is setup to use clippy when explicitly disabled: clippyFlags=%q", r.Args["clippyFlags"]) } |