Skip to content

Commit 3ee9f49

Browse files
committed
Bump ui_test crate
1 parent 2b9f96f commit 3ee9f49

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ libloading = "0.7"
3636

3737
[dev-dependencies]
3838
colored = "2"
39-
ui_test = "0.12"
39+
ui_test = "0.13"
4040
rustc_version = "0.4"
4141
# Features chosen to match those required by env_logger, to avoid rebuilds
4242
regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }

tests/compiletest.rs

+11-4
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,16 @@ fn main() -> Result<()> {
230230
ui(Mode::Pass, "tests/pass", &target, WithoutDependencies)?;
231231
ui(Mode::Pass, "tests/pass-dep", &target, WithDependencies)?;
232232
ui(Mode::Panic, "tests/panic", &target, WithDependencies)?;
233-
ui(Mode::Fail { require_patterns: true }, "tests/fail", &target, WithDependencies)?;
233+
ui(
234+
Mode::Fail { require_patterns: true, rustfix: false },
235+
"tests/fail",
236+
&target,
237+
WithDependencies,
238+
)?;
234239
if cfg!(target_os = "linux") {
235240
ui(Mode::Pass, "tests/extern-so/pass", &target, WithoutDependencies)?;
236241
ui(
237-
Mode::Fail { require_patterns: true },
242+
Mode::Fail { require_patterns: true, rustfix: false },
238243
"tests/extern-so/fail",
239244
&target,
240245
WithoutDependencies,
@@ -246,11 +251,13 @@ fn main() -> Result<()> {
246251

247252
fn run_dep_mode(target: String, mut args: impl Iterator<Item = OsString>) -> Result<()> {
248253
let path = args.next().expect("./miri run-dep must be followed by a file name");
249-
let mut config = test_config(&target, "", Mode::Yolo, /* with dependencies */ true);
254+
let mut config =
255+
test_config(&target, "", Mode::Yolo { rustfix: false }, /* with dependencies */ true);
250256
config.program.args.clear(); // We want to give the user full control over flags
251-
config.build_dependencies_and_link_them()?;
257+
let dep_args = config.build_dependencies()?;
252258

253259
let mut cmd = config.program.build(&config.out_dir);
260+
cmd.args(dep_args);
254261

255262
cmd.arg(path);
256263

0 commit comments

Comments
 (0)