diff options
author | 2020-08-13 12:55:59 +0200 | |
---|---|---|
committer | 2020-08-13 15:58:09 +0200 | |
commit | 9e8451e5243e77fef5fddfdf4f000d82f66e395f (patch) | |
tree | a855d09c583178e0a256aae041c3fedb1f09ffb0 /rust/clippy_test.go | |
parent | 29737cfc944f73f5c1095126d1d2d701b1a7db09 (diff) |
rust: modify linting properties
Move the linting properties to an enum with 4 possible options:
"default", "android", "vendor" or "none". The previous logic for
default, based on the module's location, is kept. It is now possible to
force the upgrade to a certain lint level for some modules (e.g.
external/[...]/android). Update the unit tests and documentation.
Bug: 163400111
Test: m
Change-Id: I8e464b04401158ed2d3c518a9b72f145a9835c99
Diffstat (limited to 'rust/clippy_test.go')
-rw-r--r-- | rust/clippy_test.go | 68 |
1 files changed, 57 insertions, 11 deletions
diff --git a/rust/clippy_test.go b/rust/clippy_test.go index 314417362..7815aab9d 100644 --- a/rust/clippy_test.go +++ b/rust/clippy_test.go @@ -16,31 +16,77 @@ package rust import ( "testing" + + "android/soong/android" ) func TestClippy(t *testing.T) { - ctx := testRust(t, ` + + bp := ` + // foo uses the default value of clippy_lints rust_library { name: "libfoo", srcs: ["foo.rs"], crate_name: "foo", } + // bar forces the use of the "android" lint set + rust_library { + name: "libbar", + srcs: ["foo.rs"], + crate_name: "bar", + clippy_lints: "android", + } + // foobar explicitly disable clippy rust_library { name: "libfoobar", srcs: ["foo.rs"], crate_name: "foobar", - clippy: false, - }`) + clippy_lints: "none", + }` + + bp = bp + GatherRequiredDepsForTest() - ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_dylib").Output("libfoo.dylib.so") - fooClippy := ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_dylib").MaybeRule("clippy") - if fooClippy.Rule.String() != "android/soong/rust.clippy" { - t.Errorf("Clippy output (default) for libfoo was not generated: %+v", fooClippy) + fs := map[string][]byte{ + // Reuse the same blueprint file for subdirectories. + "external/Android.bp": []byte(bp), + "hardware/Android.bp": []byte(bp), } - ctx.ModuleForTests("libfoobar", "android_arm64_armv8-a_dylib").Output("libfoobar.dylib.so") - foobarClippy := ctx.ModuleForTests("libfoobar", "android_arm64_armv8-a_dylib").MaybeRule("clippy") - if foobarClippy.Rule != nil { - t.Errorf("Clippy output for libfoobar is not empty") + var clippyLintTests = []struct { + modulePath string + fooFlags string + }{ + {"", "${config.ClippyDefaultLints}"}, + {"external/", ""}, + {"hardware/", "${config.ClippyVendorLints}"}, + } + + for _, tc := range clippyLintTests { + t.Run("path="+tc.modulePath, func(t *testing.T) { + + config := android.TestArchConfig(buildDir, nil, bp, fs) + ctx := CreateTestContext() + ctx.Register(config) + _, errs := ctx.ParseFileList(".", []string{tc.modulePath + "Android.bp"}) + android.FailIfErrored(t, errs) + _, errs = ctx.PrepareBuildActions(config) + android.FailIfErrored(t, errs) + + r := ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_dylib").MaybeRule("clippy") + if r.Args["clippyFlags"] != tc.fooFlags { + t.Errorf("Incorrect flags for libfoo: %q, want %q", r.Args["clippyFlags"], tc.fooFlags) + } + + r = ctx.ModuleForTests("libbar", "android_arm64_armv8-a_dylib").MaybeRule("clippy") + if r.Args["clippyFlags"] != "${config.ClippyDefaultLints}" { + t.Errorf("Incorrect flags for libbar: %q, want %q", r.Args["clippyFlags"], "${config.ClippyDefaultLints}") + } + + r = ctx.ModuleForTests("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"]) + } + + }) } } |