mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-02 15:32:06 +00:00
Check for asm support in UI tests that require it
Add `needs-asm-support` compiletest directive, and use it in asm tests that require asm support without relying on any architecture specific features.
This commit is contained in:
parent
58f32da346
commit
da40e69b60
@ -1,6 +1,6 @@
|
|||||||
// Checks that #[naked] attribute can be placed on function definitions only.
|
// Checks that #[naked] attribute can be placed on function definitions only.
|
||||||
//
|
//
|
||||||
// ignore-wasm32 asm unsupported
|
// needs-asm-support
|
||||||
#![feature(asm)]
|
#![feature(asm)]
|
||||||
#![feature(naked_functions)]
|
#![feature(naked_functions)]
|
||||||
#![naked] //~ ERROR should be applied to a function definition
|
#![naked] //~ ERROR should be applied to a function definition
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// needs-asm-support
|
||||||
#![feature(asm)]
|
#![feature(asm)]
|
||||||
|
|
||||||
#[naked]
|
#[naked]
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
error[E0658]: the `#[naked]` attribute is an experimental feature
|
error[E0658]: the `#[naked]` attribute is an experimental feature
|
||||||
--> $DIR/feature-gate-naked_functions.rs:3:1
|
--> $DIR/feature-gate-naked_functions.rs:4:1
|
||||||
|
|
|
|
||||||
LL | #[naked]
|
LL | #[naked]
|
||||||
| ^^^^^^^^
|
| ^^^^^^^^
|
||||||
@ -8,7 +8,7 @@ LL | #[naked]
|
|||||||
= help: add `#![feature(naked_functions)]` to the crate attributes to enable
|
= help: add `#![feature(naked_functions)]` to the crate attributes to enable
|
||||||
|
|
||||||
error[E0658]: the `#[naked]` attribute is an experimental feature
|
error[E0658]: the `#[naked]` attribute is an experimental feature
|
||||||
--> $DIR/feature-gate-naked_functions.rs:9:1
|
--> $DIR/feature-gate-naked_functions.rs:10:1
|
||||||
|
|
|
|
||||||
LL | #[naked]
|
LL | #[naked]
|
||||||
| ^^^^^^^^
|
| ^^^^^^^^
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// needs-asm-support
|
||||||
#![feature(asm, naked_functions)]
|
#![feature(asm, naked_functions)]
|
||||||
|
|
||||||
#[track_caller] //~ ERROR cannot use `#[track_caller]` with `#[naked]`
|
#[track_caller] //~ ERROR cannot use `#[track_caller]` with `#[naked]`
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
error[E0736]: cannot use `#[track_caller]` with `#[naked]`
|
error[E0736]: cannot use `#[track_caller]` with `#[naked]`
|
||||||
--> $DIR/error-with-naked.rs:3:1
|
--> $DIR/error-with-naked.rs:4:1
|
||||||
|
|
|
|
||||||
LL | #[track_caller]
|
LL | #[track_caller]
|
||||||
| ^^^^^^^^^^^^^^^
|
| ^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
error[E0736]: cannot use `#[track_caller]` with `#[naked]`
|
error[E0736]: cannot use `#[track_caller]` with `#[naked]`
|
||||||
--> $DIR/error-with-naked.rs:12:5
|
--> $DIR/error-with-naked.rs:13:5
|
||||||
|
|
|
|
||||||
LL | #[track_caller]
|
LL | #[track_caller]
|
||||||
| ^^^^^^^^^^^^^^^
|
| ^^^^^^^^^^^^^^^
|
||||||
|
@ -44,6 +44,7 @@ impl EarlyProps {
|
|||||||
let mut props = EarlyProps::default();
|
let mut props = EarlyProps::default();
|
||||||
let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some();
|
let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some();
|
||||||
let rustc_has_sanitizer_support = env::var_os("RUSTC_SANITIZER_SUPPORT").is_some();
|
let rustc_has_sanitizer_support = env::var_os("RUSTC_SANITIZER_SUPPORT").is_some();
|
||||||
|
let has_asm_support = util::has_asm_support(&config.target);
|
||||||
let has_asan = util::ASAN_SUPPORTED_TARGETS.contains(&&*config.target);
|
let has_asan = util::ASAN_SUPPORTED_TARGETS.contains(&&*config.target);
|
||||||
let has_lsan = util::LSAN_SUPPORTED_TARGETS.contains(&&*config.target);
|
let has_lsan = util::LSAN_SUPPORTED_TARGETS.contains(&&*config.target);
|
||||||
let has_msan = util::MSAN_SUPPORTED_TARGETS.contains(&&*config.target);
|
let has_msan = util::MSAN_SUPPORTED_TARGETS.contains(&&*config.target);
|
||||||
@ -76,6 +77,10 @@ impl EarlyProps {
|
|||||||
props.ignore = true;
|
props.ignore = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !has_asm_support && config.parse_name_directive(ln, "needs-asm-support") {
|
||||||
|
props.ignore = true;
|
||||||
|
}
|
||||||
|
|
||||||
if !rustc_has_profiler_support && config.parse_needs_profiler_support(ln) {
|
if !rustc_has_profiler_support && config.parse_needs_profiler_support(ln) {
|
||||||
props.ignore = true;
|
props.ignore = true;
|
||||||
}
|
}
|
||||||
|
@ -223,6 +223,17 @@ fn sanitizers() {
|
|||||||
assert!(parse_rs(&config, "// needs-sanitizer-thread").ignore);
|
assert!(parse_rs(&config, "// needs-sanitizer-thread").ignore);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn asm_support() {
|
||||||
|
let mut config = config();
|
||||||
|
|
||||||
|
config.target = "avr-unknown-gnu-atmega328".to_owned();
|
||||||
|
assert!(parse_rs(&config, "// needs-asm-support").ignore);
|
||||||
|
|
||||||
|
config.target = "i686-unknown-netbsd".to_owned();
|
||||||
|
assert!(!parse_rs(&config, "// needs-asm-support").ignore);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_extract_version_range() {
|
fn test_extract_version_range() {
|
||||||
use super::{extract_llvm_version, extract_version_range};
|
use super::{extract_llvm_version, extract_version_range};
|
||||||
|
@ -128,6 +128,15 @@ const BIG_ENDIAN: &[&str] = &[
|
|||||||
"sparcv9",
|
"sparcv9",
|
||||||
];
|
];
|
||||||
|
|
||||||
|
static ASM_SUPPORTED_ARCHS: &[&str] = &[
|
||||||
|
"x86", "x86_64", "arm", "aarch64", "riscv32", "riscv64", "nvptx64", "hexagon", "mips",
|
||||||
|
"mips64", "spirv", "wasm32",
|
||||||
|
];
|
||||||
|
|
||||||
|
pub fn has_asm_support(triple: &str) -> bool {
|
||||||
|
ASM_SUPPORTED_ARCHS.contains(&get_arch(triple))
|
||||||
|
}
|
||||||
|
|
||||||
pub fn matches_os(triple: &str, name: &str) -> bool {
|
pub fn matches_os(triple: &str, name: &str) -> bool {
|
||||||
// For the wasm32 bare target we ignore anything also ignored on emscripten
|
// For the wasm32 bare target we ignore anything also ignored on emscripten
|
||||||
// and then we also recognize `wasm32-bare` as the os for the target
|
// and then we also recognize `wasm32-bare` as the os for the target
|
||||||
|
Loading…
Reference in New Issue
Block a user