about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2023-07-26 18:43:40 +0000
committerMichael Goulet <michael@errs.io>2023-07-26 18:43:40 +0000
commit1794466c00379de37441ef605eff5e6a3d3a8b85 (patch)
treefdde0b2d1bc1b41d69b6b807822c9accc42eb309
parent601a34de8c10458b72a7781eb0b44a7981e4a2b1 (diff)
downloadrust-1794466c00379de37441ef605eff5e6a3d3a8b85.tar.gz
rust-1794466c00379de37441ef605eff5e6a3d3a8b85.zip
Dont pass -Zwrite-long-types-to-disk=no for ui-fulldeps --stage=1
-rw-r--r--src/tools/compiletest/src/runtest.rs9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index ba068995d44..45582ddcbaf 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2330,7 +2330,14 @@ impl<'test> TestCx<'test> {
                 // Hide line numbers to reduce churn
                 rustc.arg("-Zui-testing");
                 rustc.arg("-Zdeduplicate-diagnostics=no");
-                rustc.arg("-Zwrite-long-types-to-disk=no");
+                // #[cfg(not(bootstrap)] unconditionally pass flag after beta bump
+                // since `ui-fulldeps --stage=1` builds using the stage 0 compiler,
+                // which doesn't have this flag.
+                if !(self.config.stage_id.starts_with("stage1-")
+                    && self.config.suite == "ui-fulldeps")
+                {
+                    rustc.arg("-Zwrite-long-types-to-disk=no");
+                }
                 // FIXME: use this for other modes too, for perf?
                 rustc.arg("-Cstrip=debuginfo");
             }