Skip to content

Commit 63b608c

Browse files
committed
Bump ui_test crate
1 parent c0f13ef commit 63b608c

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,16 @@ fn main() -> Result<()> {
229229
ui(Mode::Pass, "tests/pass", &target, WithoutDependencies)?;
230230
ui(Mode::Pass, "tests/pass-dep", &target, WithDependencies)?;
231231
ui(Mode::Panic, "tests/panic", &target, WithDependencies)?;
232-
ui(Mode::Fail { require_patterns: true }, "tests/fail", &target, WithDependencies)?;
232+
ui(
233+
Mode::Fail { require_patterns: true, rustfix: false },
234+
"tests/fail",
235+
&target,
236+
WithDependencies,
237+
)?;
233238
if cfg!(target_os = "linux") {
234239
ui(Mode::Pass, "tests/extern-so/pass", &target, WithoutDependencies)?;
235240
ui(
236-
Mode::Fail { require_patterns: true },
241+
Mode::Fail { require_patterns: true, rustfix: false },
237242
"tests/extern-so/fail",
238243
&target,
239244
WithoutDependencies,
@@ -245,11 +250,13 @@ fn main() -> Result<()> {
245250

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

252258
let mut cmd = config.program.build(&config.out_dir);
259+
cmd.args(dep_args);
253260

254261
cmd.arg(path);
255262

0 commit comments

Comments
 (0)