Skip to content

Commit 4e54d34

Browse files
authored
Moved cargo_build_script test into appropriate dir. (#3024)
1 parent 43e5279 commit 4e54d34

File tree

7 files changed

+35
-66
lines changed

7 files changed

+35
-66
lines changed

MODULE.bazel

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,3 @@ use_repo(
110110
"t3p__serde-1.0.214",
111111
"t3p__serde_json-1.0.132",
112112
)
113-
114-
register_toolchains(
115-
"//test/foreign_toolchain_make_variables:toolchain_for_test",
116-
dev_dependency = True,
117-
)

WORKSPACE.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,3 @@ http_archive(
6060
load("//test/3rdparty/crates:crates.bzl", test_crate_repositories = "crate_repositories")
6161

6262
test_crate_repositories()
63-
64-
register_toolchains("//test/foreign_toolchain_make_variables:toolchain_for_test")
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
load("//cargo:defs.bzl", "cargo_build_script")
2+
load(":toolchain.bzl", "dummy_env_var_toolchain")
3+
4+
cargo_build_script(
5+
name = "bs",
6+
srcs = ["build.rs"],
7+
build_script_env = {
8+
"FROM_TOOLCHAIN": "$(FROM_TOOLCHAIN)",
9+
"MODIFIED_FROM_TOOLCHAIN": "modified$(FROM_TOOLCHAIN)",
10+
},
11+
edition = "2021",
12+
toolchains = [":dummy_env_var_toolchain"],
13+
)
14+
15+
dummy_env_var_toolchain(
16+
name = "dummy_env_var_toolchain",
17+
)
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
"""Utilties for testing forwarding Make variables from toolchains."""
2+
3+
def _dummy_env_var_toolchain_impl(_ctx):
4+
make_variables = platform_common.TemplateVariableInfo({
5+
"ALSO_FROM_TOOLCHAIN": "absent",
6+
"FROM_TOOLCHAIN": "present",
7+
})
8+
9+
return [
10+
platform_common.ToolchainInfo(
11+
make_variables = make_variables,
12+
),
13+
make_variables,
14+
]
15+
16+
dummy_env_var_toolchain = rule(
17+
implementation = _dummy_env_var_toolchain_impl,
18+
)

test/foreign_toolchain_make_variables/BUILD.bazel

Lines changed: 0 additions & 25 deletions
This file was deleted.

test/foreign_toolchain_make_variables/toolchain.bzl

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)