Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Flip incompatible_disable_custom_test_launcher #1079

Merged
merged 2 commits into from
Jan 6, 2022
Merged

Flip incompatible_disable_custom_test_launcher #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb687a6
Updated tests
UebelAndre Dec 29, 2021
24f6518
Flip `incompatible_disable_custom_test_launcher`
UebelAndre Dec 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust/settings/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ incompatible_flag(

incompatible_flag(
name = "incompatible_disable_custom_test_launcher",
build_setting_default = False,
build_setting_default = True,
issue = "https://github.com/bazelbuild/rules_rust/issues/1069",
)

Expand Down
4 changes: 2 additions & 2 deletions test/test_env_launcher/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ rust_test(
edition = "2018",
env = {
"FERRIS_SAYS": "Hello fellow Rustaceans!",
"HELLO_WORLD_BIN_ROOTPATH": "$(rootpath :hello-world)",
"HELLO_WORLD_SRC_EXECPATH": "$(execpath :hello_world_main)",
"HELLO_WORLD_BIN": "$(rootpath :hello-world)",
"HELLO_WORLD_SRC": "$(rootpath :hello_world_main)",
},
)
8 changes: 3 additions & 5 deletions test/test_env_launcher/tests/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ fn run() {
);

// Test the behavior of `rootpath` and that a binary can be found relative to current_dir
let hello_world_bin =
std::path::PathBuf::from(std::env::var_os("HELLO_WORLD_BIN_ROOTPATH").unwrap());
let hello_world_bin = std::path::PathBuf::from(std::env::var_os("HELLO_WORLD_BIN").unwrap());

assert_eq!(
hello_world_bin.as_path(),
Expand All @@ -28,8 +27,7 @@ fn run() {
assert!(hello_world_bin.exists());

// Ensure `execpath` expanded variables map to real files and have absolute paths
let hello_world_src =
std::path::PathBuf::from(std::env::var("HELLO_WORLD_SRC_EXECPATH").unwrap());
assert!(hello_world_src.is_absolute());
let hello_world_src = std::path::PathBuf::from(std::env::var("HELLO_WORLD_SRC").unwrap());
assert!(!hello_world_bin.is_absolute());
assert!(hello_world_src.exists());
}