rustbuild: Untie `debuginfo-level-tests` from `debuginfo-level`

diff --git a/config.toml.example b/config.toml.example
index 361a1b00ae226abd48758c2dbacb8f3844dffba9..ae3107b51feaf306f323e7865bbcd27bba1ef04d 100644 (file)
--- 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 836a1d13c3053caf1a9316e059771b98b5c4a983..d618654b129af844b3a3a1ca6097da7ae6e39d3d 100644 (file)
--- 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);