Skip to content

Commit ea662a8

Browse files
committed
fix default-backtrace-ice test
when running `tests/ui/panics/default-backtrace-ice.rs locally it gave this error: ``` failures: ---- [ui] tests/ui/panics/default-backtrace-ice.rs stdout ---- Saved the actual stderr to "/home/jyn/src/rust3/build/x86_64-unknown-linux-gnu/test/ui/panics/default-backtrace-ice/default-backtrace-ice.stderr" diff of stderr: 7 8 aborting due to `-Z treat-err-as-bug=1` 9 stack backtrace: - (end_short_backtrace) - (begin_short_backtrace) - (end_short_backtrace) - (begin_short_backtrace) + [... omitted 22 frames ...] + ``` this is a regression from setting RUST_BACKTRACE=1 by default. we need to turn off the new behavior when running UI tests so that they reflect our dist compiler. normally that's done by checking `sess.unstable_opts.ui_testing`, but this happens extremely early in the compiler before we've expanded arg files. do an extremely simple hack that doesn't work in all cases - we don't need it to work in all cases, only when running UI tests.
1 parent c7a28d5 commit ea662a8

File tree

1 file changed

+3
-1
lines changed
  • compiler/rustc_driver_impl/src

1 file changed

+3
-1
lines changed

compiler/rustc_driver_impl/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,9 @@ pub fn install_ice_hook(
13881388
// opt in to less-verbose backtraces by manually setting "RUST_BACKTRACE"
13891389
// (e.g. `RUST_BACKTRACE=1`)
13901390
if env::var_os("RUST_BACKTRACE").is_none() {
1391-
if env!("CFG_RELEASE_CHANNEL") == "dev" {
1391+
// HACK: this check is extremely dumb, but we don't really need it to be smarter since this should only happen in the test suite anyway.
1392+
let ui_testing = std::env::args().any(|arg| arg == "-Zui-testing");
1393+
if env!("CFG_RELEASE_CHANNEL") == "dev" && !ui_testing {
13921394
panic::set_backtrace_style(panic::BacktraceStyle::Short);
13931395
} else {
13941396
panic::set_backtrace_style(panic::BacktraceStyle::Full);

0 commit comments

Comments
 (0)