Skip to content

Commit 79c0db4

Browse files
committed
Clean up some uses of logging in ui tests
1 parent 73ca84d commit 79c0db4

File tree

5 files changed

+9
-19
lines changed

5 files changed

+9
-19
lines changed

src/test/ui/issues/issue-18075.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// run-pass
2-
// exec-env:RUSTC_LOG=rustc::middle=debug
2+
// rustc-env:RUSTC_LOG=rustc::middle=debug
33

44
fn main() {
55
let b = 1isize;

src/test/ui/logging-only-prints-once.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// run-pass
22
// ignore-windows
33
// ignore-emscripten no threads support
4-
// exec-env:RUSTC_LOG=debug
54

65
use std::cell::Cell;
76
use std::fmt;
@@ -19,10 +18,13 @@ impl fmt::Debug for Foo {
1918
}
2019

2120
pub fn main() {
22-
thread::spawn(move|| {
21+
thread::spawn(move || {
2322
let mut f = Foo(Cell::new(0));
2423
println!("{:?}", f);
2524
let Foo(ref mut f) = f;
2625
assert_eq!(f.get(), 1);
27-
}).join().ok().unwrap();
26+
})
27+
.join()
28+
.ok()
29+
.unwrap();
2830
}

src/test/ui/logging_before_rt_started.rs

-12
This file was deleted.

src/test/ui/threads-sendsync/spawning-with-debug.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#![allow(unused_must_use)]
33
#![allow(unused_mut)]
44
// ignore-windows
5-
// exec-env:RUSTC_LOG=debug
5+
// exec-env:RUST_LOG=debug
66
// ignore-emscripten no threads support
77

88
// regression test for issue #10405, make sure we don't call println! too soon.
@@ -11,5 +11,5 @@ use std::thread::Builder;
1111

1212
pub fn main() {
1313
let mut t = Builder::new();
14-
t.spawn(move|| ());
14+
t.spawn(move || ());
1515
}

src/tools/compiletest/src/runtest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ impl<'test> TestCx<'test> {
623623
.arg("-L")
624624
.arg(&aux_dir)
625625
.args(&self.props.compile_flags)
626-
.envs(self.props.exec_env.clone());
626+
.envs(self.props.rustc_env.clone());
627627
self.maybe_add_external_args(
628628
&mut rustc,
629629
self.split_maybe_args(&self.config.target_rustcflags),

0 commit comments

Comments
 (0)