about summary refs log tree commit diff
path: root/src/tools/compiletest
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2023-08-04 19:32:54 +0000
committerMichael Goulet <michael@errs.io>2023-08-04 19:32:54 +0000
commitf78485a97ecea3327e212275a32bd987267cbdc8 (patch)
tree23a6a38757250a60dc7d9b1964889909b5190bf1 /src/tools/compiletest
parent03181e0547c1e15a2c0431337b2d5ee00fd0374c (diff)
downloadrust-f78485a97ecea3327e212275a32bd987267cbdc8.tar.gz
rust-f78485a97ecea3327e212275a32bd987267cbdc8.zip
Fix ui-fulldeps missing the internal_features lint on stage 0
Diffstat (limited to 'src/tools/compiletest')
-rw-r--r--src/tools/compiletest/src/runtest.rs9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 07a54cb26d3..c1987420417 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2466,8 +2466,13 @@ impl<'test> TestCx<'test> {
             rustc.args(&["-A", "unused"]);
         }
 
-        // Allow tests to use internal features.
-        rustc.args(&["-A", "internal_features"]);
+        // #[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 lint.
+        if !(self.config.stage_id.starts_with("stage1-") && self.config.suite == "ui-fulldeps") {
+            // Allow tests to use internal features.
+            rustc.args(&["-A", "internal_features"]);
+        }
 
         if self.props.force_host {
             self.maybe_add_external_args(&mut rustc, &self.config.host_rustcflags);