Skip to content

Fix the shell_quoting test #5680

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

Merged
merged 2 commits into from
Jul 6, 2018
Merged

Fix the shell_quoting test #5680

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
d1cb78a
get the new test working
mikeyhew Jul 4, 2018
2e17235
add `MSYSTEM=1` to shell_quoting test
mikeyhew Jul 6, 2018
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
1 change: 1 addition & 0 deletions tests/testsuite/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ mod rustdocflags;
mod rustdoc;
mod rustflags;
mod search;
mod shell_quoting;
mod small_fd_limits;
mod test;
mod tool_paths;
Expand Down
16 changes: 8 additions & 8 deletions tests/testsuite/shell_quoting.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use cargotest::support::{
execs,
project,
};
use hamcrest::assert_that
use hamcrest::assert_that;

#[test]
fn features_are_quoted() {
Expand All @@ -28,16 +28,16 @@ fn features_are_quoted() {
.build();

assert_that(
p.cargo("check -v"),
p.cargo("check -v")
.env("MSYSTEM", "1"),
execs()
.with_status(101)
.with_stderr_contains(
r#"\
[CHECKING] foo [..]
[RUNNING] `rustc [..] --cfg 'feature="default"' --cfg 'feature="some_feature"' [..]`
[ERROR] [..]
process didn't exit successfully: `rustc [..] --cfg 'feature="default"' --cfg 'feature="some_feature"' [..]`
"#
r#"[RUNNING] `rustc [..] --cfg 'feature="default"' --cfg 'feature="some_feature"' [..]`"#
).with_stderr_contains(
r#"
Caused by:
process didn't exit successfully: [..] --cfg 'feature="default"' --cfg 'feature="some_feature"' [..]"#
)
);
}