From 763470dc1312482f8f067f90925579fb0072ef92 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Fri, 24 May 2019 02:11:33 +0300 Subject: [PATCH] rustbuild: Untie `debuginfo-level-tests` from `debuginfo-level` --- config.toml.example | 8 +++++--- src/bootstrap/config.rs | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config.toml.example b/config.toml.example index 361a1b00ae2..ae3107b51fe 100644 --- a/config.toml.example +++ b/config.toml.example @@ -301,11 +301,13 @@ # library. #debug-assertions = false -# Debuginfo level for Rust code, corresponds to the `-C debuginfo=N` option of `rustc`. +# Debuginfo level for most of Rust code, corresponds to the `-C debuginfo=N` option of `rustc`. # `0` - no debug info # `1` - line tables only # `2` - full debug info with variable and type information -# Can be overriden for specific subsets of Rust code (rustc, std, tools or tests). +# Can be overriden for specific subsets of Rust code (rustc, std or tools). +# Debuginfo for tests run with compiletest is not controlled by this option +# and needs to be enabled separately with `debuginfo-level-tests`. #debuginfo-level = if debug { 2 } else { 0 } # Debuginfo level for the compiler. @@ -318,7 +320,7 @@ #debuginfo-level-tools = debuginfo-level # Debuginfo level for the test suites run with compiletest. -#debuginfo-level-tests = debuginfo-level +#debuginfo-level-tests = 0 # Whether or not `panic!`s generate backtraces (RUST_BACKTRACE) #backtrace = true diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 836a1d13c30..d618654b129 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -650,7 +650,7 @@ pub fn parse(args: &[String]) -> Config { config.rust_debuginfo_level_rustc = with_defaults(debuginfo_level_rustc); config.rust_debuginfo_level_std = with_defaults(debuginfo_level_std); config.rust_debuginfo_level_tools = with_defaults(debuginfo_level_tools); - config.rust_debuginfo_level_tests = with_defaults(debuginfo_level_tests); + config.rust_debuginfo_level_tests = debuginfo_level_tests.unwrap_or(0); let default = config.channel == "dev"; config.ignore_git = ignore_git.unwrap_or(default); -- 2.44.0