diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-05-03 16:25:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-03 16:25:00 +0200 |
| commit | bfa22cfbcaf207b88006a564989904f6d0c1b5c7 (patch) | |
| tree | 92a4a3c8698d64fd2e784fa86dd20e4007c5ca17 /src/test | |
| parent | 3e536e8ac6a722285190416b21a1684289f18b64 (diff) | |
| parent | bf4d0adf2395a260b024586e105f2e109222201c (diff) | |
| download | rust-bfa22cfbcaf207b88006a564989904f6d0c1b5c7.tar.gz rust-bfa22cfbcaf207b88006a564989904f6d0c1b5c7.zip | |
Rollup merge of #60401 - JohnTitor:rename-log, r=davidtwco
Rename `RUST_LOG` to `RUSTC_LOG` cc: #57985 I think we should also change these submodules: - rustc-guide - Cargo (rename to `CARGO_LOG`, cc: https://github.com/rust-lang/cargo/pull/6605, https://github.com/rust-lang/cargo/issues/6189) - miri - rls - rustfmt r? @davidtwco
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-make-fulldeps/libs-through-symlinks/Makefile | 2 | ||||
| -rw-r--r-- | src/test/run-pass/issues/issue-18075.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/logging-only-prints-once.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/logging_before_rt_started.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/rustc-rust-log.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/threads-sendsync/spawning-with-debug.rs | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/test/run-make-fulldeps/libs-through-symlinks/Makefile b/src/test/run-make-fulldeps/libs-through-symlinks/Makefile index 7c5ea7e402e..8be2e234fea 100644 --- a/src/test/run-make-fulldeps/libs-through-symlinks/Makefile +++ b/src/test/run-make-fulldeps/libs-through-symlinks/Makefile @@ -8,4 +8,4 @@ all: mkdir -p $(TMPDIR)/outdir $(RUSTC) foo.rs -o $(TMPDIR)/outdir/$(NAME) ln -nsf outdir/$(NAME) $(TMPDIR) - RUST_LOG=rustc_metadata::loader $(RUSTC) bar.rs + RUSTC_LOG=rustc_metadata::loader $(RUSTC) bar.rs diff --git a/src/test/run-pass/issues/issue-18075.rs b/src/test/run-pass/issues/issue-18075.rs index dcd67d8d15a..ee6845c1278 100644 --- a/src/test/run-pass/issues/issue-18075.rs +++ b/src/test/run-pass/issues/issue-18075.rs @@ -1,5 +1,5 @@ // run-pass -// exec-env:RUST_LOG=rustc::middle=debug +// exec-env:RUSTC_LOG=rustc::middle=debug fn main() { let b = 1isize; diff --git a/src/test/run-pass/logging-only-prints-once.rs b/src/test/run-pass/logging-only-prints-once.rs index 7b105600225..1a4c4d89e7d 100644 --- a/src/test/run-pass/logging-only-prints-once.rs +++ b/src/test/run-pass/logging-only-prints-once.rs @@ -1,6 +1,6 @@ // ignore-windows // ignore-emscripten no threads support -// exec-env:RUST_LOG=debug +// exec-env:RUSTC_LOG=debug use std::cell::Cell; use std::fmt; diff --git a/src/test/run-pass/logging_before_rt_started.rs b/src/test/run-pass/logging_before_rt_started.rs index 0cba1080de2..69cfc54c465 100644 --- a/src/test/run-pass/logging_before_rt_started.rs +++ b/src/test/run-pass/logging_before_rt_started.rs @@ -1,4 +1,4 @@ -// exec-env:RUST_LOG=std::ptr +// exec-env:RUSTC_LOG=std::ptr // In issue #9487, it was realized that std::ptr was invoking the logging // infrastructure, and when std::ptr was used during runtime initialization, diff --git a/src/test/run-pass/rustc-rust-log.rs b/src/test/run-pass/rustc-rust-log.rs index 4360a154015..b6642572418 100644 --- a/src/test/run-pass/rustc-rust-log.rs +++ b/src/test/run-pass/rustc-rust-log.rs @@ -8,6 +8,6 @@ // dont-check-compiler-stderr // compile-flags: --error-format human -// rustc-env:RUST_LOG=debug +// rustc-env:RUSTC_LOG=debug fn main() {} diff --git a/src/test/run-pass/threads-sendsync/spawning-with-debug.rs b/src/test/run-pass/threads-sendsync/spawning-with-debug.rs index c78ae78dd1b..388d62aa710 100644 --- a/src/test/run-pass/threads-sendsync/spawning-with-debug.rs +++ b/src/test/run-pass/threads-sendsync/spawning-with-debug.rs @@ -2,7 +2,7 @@ #![allow(unused_must_use)] #![allow(unused_mut)] // ignore-windows -// exec-env:RUST_LOG=debug +// exec-env:RUSTC_LOG=debug // ignore-emscripten no threads support // regression test for issue #10405, make sure we don't call println! too soon. |
