about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-07-04 12:32:39 +0000
committerbors <bors@rust-lang.org>2022-07-04 12:32:39 +0000
commitd2074cbeeceb8b28fb6249a9aa3c937fe1c0bb92 (patch)
treeb32099863f914d7ab93bbdb1fbaf2370d1a5f5d0 /src/bootstrap
parenta3beeaa84da241f35888338ded6659938206ff13 (diff)
parentf71923942499124357b9005ea3567b20f4f5ab26 (diff)
downloadrust-d2074cbeeceb8b28fb6249a9aa3c937fe1c0bb92.tar.gz
rust-d2074cbeeceb8b28fb6249a9aa3c937fe1c0bb92.zip
Auto merge of #98817 - the8472:dont-optimize-ui-tests, r=Mark-Simulacrum
Only obey optimize-tests flag on UI tests that are run-pass

stage1 UI tests walltime on my machine:

```
optimize-tests = false, master
25.98s

optimize-tests = true, master
34.69s

optimize-tests = true, patched
28.79s
```

Effects:

- faster UI tests
- llvm asserts get exercised less on build-pass tests
- the difference between opt and nopt builds shrinks a bit
- aux libs don't get optimized since they don't have a pass mode and almost never have explicit compile flags
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/test.rs9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 9958306b576..f3395507bb0 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -1363,13 +1363,10 @@ note: if you're sure you want to do this, please open an issue as to why. In the
         if let Some(ref npm) = builder.config.npm {
             cmd.arg("--npm").arg(npm);
         }
-
-        let mut flags = if is_rustdoc { Vec::new() } else { vec!["-Crpath".to_string()] };
-        if !is_rustdoc {
-            if builder.config.rust_optimize_tests {
-                flags.push("-O".to_string());
-            }
+        if builder.config.rust_optimize_tests {
+            cmd.arg("--optimize-tests");
         }
+        let mut flags = if is_rustdoc { Vec::new() } else { vec!["-Crpath".to_string()] };
         flags.push(format!("-Cdebuginfo={}", builder.config.rust_debuginfo_level_tests));
         flags.push(builder.config.cmd.rustc_args().join(" "));