From a74d6c2125761f96e156a4e924298fcecb8333eb Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Mon, 22 Apr 2024 16:32:30 +0000
Subject: [PATCH] Only apply --cap-lints to the extended_sysroot test suite
---
build_system/tests.rs | 10 +++++-----
example/alloc_example.rs | 1 +
example/float-minmax-pass.rs | 2 +-
example/mod_bench.rs | 1 +
example/std_example.rs | 1 +
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/build_system/tests.rs b/build_system/tests.rs
index 9efb6ed715c..76104901474 100644
--- a/build_system/tests.rs
+++ b/build_system/tests.rs
@@ -290,7 +290,7 @@ pub(crate) fn run_tests(
&& !skip_tests.contains(&"testsuite.extended_sysroot");
if run_base_sysroot || run_extended_sysroot {
- let mut target_compiler = build_sysroot::build_sysroot(
+ let target_compiler = build_sysroot::build_sysroot(
dirs,
channel,
sysroot_kind,
@@ -299,11 +299,8 @@ pub(crate) fn run_tests(
rustup_toolchain_name,
target_triple.clone(),
);
- // Rust's build system denies a couple of lints that trigger on several of the test
- // projects. Changing the code to fix them is not worth it, so just silence all lints.
- target_compiler.rustflags.push("--cap-lints=allow".to_owned());
- let runner = TestRunner::new(
+ let mut runner = TestRunner::new(
dirs.clone(),
target_compiler,
use_unstable_features,
@@ -319,6 +316,9 @@ pub(crate) fn run_tests(
}
if run_extended_sysroot {
+ // Rust's build system denies a couple of lints that trigger on several of the test
+ // projects. Changing the code to fix them is not worth it, so just silence all lints.
+ runner.target_compiler.rustflags.push("--cap-lints=allow".to_owned());
runner.run_testsuite(EXTENDED_SYSROOT_SUITE);
} else {
eprintln!("[SKIP] extended_sysroot tests");
diff --git a/example/alloc_example.rs b/example/alloc_example.rs
index 117eed5afd8..da70ca79439 100644
--- a/example/alloc_example.rs
+++ b/example/alloc_example.rs
@@ -1,4 +1,5 @@
#![feature(start, core_intrinsics, alloc_error_handler, lang_items)]
+#![allow(internal_features)]
#![no_std]
extern crate alloc;
diff --git a/example/float-minmax-pass.rs b/example/float-minmax-pass.rs
index a71217a554b..c54574d801d 100644
--- a/example/float-minmax-pass.rs
+++ b/example/float-minmax-pass.rs
@@ -5,7 +5,7 @@
// Test that the simd_f{min,max} intrinsics produce the correct results.
#![feature(repr_simd, core_intrinsics)]
-#![allow(non_camel_case_types)]
+#![allow(internal_features, non_camel_case_types)]
#[repr(simd)]
#[derive(Copy, Clone, PartialEq, Debug)]
diff --git a/example/mod_bench.rs b/example/mod_bench.rs
index f15e48acc41..11a3e8fc72d 100644
--- a/example/mod_bench.rs
+++ b/example/mod_bench.rs
@@ -1,4 +1,5 @@
#![feature(start, core_intrinsics, lang_items)]
+#![allow(internal_features)]
#![no_std]
#[cfg_attr(unix, link(name = "c"))]
diff --git a/example/std_example.rs b/example/std_example.rs
index 2fee912e52c..0205de55622 100644
--- a/example/std_example.rs
+++ b/example/std_example.rs
@@ -7,6 +7,7 @@
tuple_trait,
unboxed_closures
)]
+#![allow(internal_features)]
#[cfg(target_arch = "x86_64")]
use std::arch::x86_64::*;