Skip to content

Commit

Permalink
Fix some buildifier errors. (bazelbuild#675)
Browse files Browse the repository at this point in the history
  • Loading branch information
sayrer authored and yagehu committed Apr 23, 2021
1 parent 49f2f90 commit 9e6ceb2
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 18 deletions.
2 changes: 1 addition & 1 deletion test/build_env/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ rust_test(

rust_test(
name = "cargo-env-vars-custom-crate-name-test",
crate_name = "custom_crate_name",
srcs = ["tests/custom_crate_name.rs"],
crate_name = "custom_crate_name",
deps = [":cargo_build_script_env-vars_build_script"],
)

Expand Down
1 change: 0 additions & 1 deletion test/unit/common.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ def assert_argv_contains_prefix_suffix(env, action, prefix, suffix):
args = action.argv,
),
)

43 changes: 27 additions & 16 deletions test/unit/crate_name/crate_name_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ def _default_crate_name_library_test_impl(ctx):
env = analysistest.begin(ctx)
tut = analysistest.target_under_test(env)
actions = analysistest.target_actions(env)

# Note: Hyphens in crate name converted to underscores.
assert_argv_contains(env, actions[0], "--crate-name=default_crate_name_library")
return analysistest.end(env)
Expand All @@ -23,6 +24,7 @@ def _default_crate_name_binary_test_impl(ctx):
env = analysistest.begin(ctx)
tut = analysistest.target_under_test(env)
actions = analysistest.target_actions(env)

# Note: Hyphens in crate name converted to underscores.
assert_argv_contains(env, actions[0], "--crate-name=default_crate_name_binary")
return analysistest.end(env)
Expand All @@ -38,6 +40,7 @@ def _default_crate_name_test_test_impl(ctx):
env = analysistest.begin(ctx)
tut = analysistest.target_under_test(env)
actions = analysistest.target_actions(env)

# Note: Hyphens in crate name converted to underscores.
assert_argv_contains(env, actions[0], "--crate-name=default_crate_name_test")
return analysistest.end(env)
Expand All @@ -60,23 +63,31 @@ def _invalid_custom_crate_name_test_impl(ctx):
return analysistest.end(env)

default_crate_name_library_test = analysistest.make(
_default_crate_name_library_test_impl)
_default_crate_name_library_test_impl,
)
custom_crate_name_library_test = analysistest.make(
_custom_crate_name_library_test_impl)
_custom_crate_name_library_test_impl,
)
default_crate_name_binary_test = analysistest.make(
_default_crate_name_binary_test_impl)
_default_crate_name_binary_test_impl,
)
custom_crate_name_binary_test = analysistest.make(
_custom_crate_name_binary_test_impl)
_custom_crate_name_binary_test_impl,
)
default_crate_name_test_test = analysistest.make(
_default_crate_name_test_test_impl)
_default_crate_name_test_test_impl,
)
custom_crate_name_test_test = analysistest.make(
_custom_crate_name_test_test_impl)
_custom_crate_name_test_test_impl,
)
invalid_default_crate_name_test = analysistest.make(
_invalid_default_crate_name_test_impl,
expect_failure = True)
expect_failure = True,
)
invalid_custom_crate_name_test = analysistest.make(
_invalid_custom_crate_name_test_impl,
expect_failure = True)
expect_failure = True,
)

def _crate_name_test():
rust_library(
Expand Down Expand Up @@ -127,42 +138,42 @@ def _crate_name_test():

default_crate_name_library_test(
name = "default_crate_name_library_test",
target_under_test = ":default-crate-name-library"
target_under_test = ":default-crate-name-library",
)

custom_crate_name_library_test(
name = "custom_crate_name_library_test",
target_under_test = ":custom-crate-name-library"
target_under_test = ":custom-crate-name-library",
)

default_crate_name_binary_test(
name = "default_crate_name_binary_test",
target_under_test = ":default-crate-name-binary"
target_under_test = ":default-crate-name-binary",
)

custom_crate_name_binary_test(
name = "custom_crate_name_binary_test",
target_under_test = ":custom-crate-name-binary"
target_under_test = ":custom-crate-name-binary",
)

default_crate_name_test_test(
name = "default_crate_name_test_test",
target_under_test = ":default-crate-name-test"
target_under_test = ":default-crate-name-test",
)

custom_crate_name_test_test(
name = "custom_crate_name_test_test",
target_under_test = ":custom-crate-name-test"
target_under_test = ":custom-crate-name-test",
)

invalid_default_crate_name_test(
name = "invalid_default_crate_name_test",
target_under_test = ":invalid/default-crate-name"
target_under_test = ":invalid/default-crate-name",
)

invalid_custom_crate_name_test(
name = "invalid_custom_crate_name_test",
target_under_test = ":invalid-custom-crate-name"
target_under_test = ":invalid-custom-crate-name",
)

def crate_name_test_suite(name):
Expand Down

0 comments on commit 9e6ceb2

Please sign in to comment.