From cfcb2b664d6f1419a6219f88b060dee420736407 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Sun, 13 Jun 2021 22:06:11 +0300 Subject: [PATCH] compiletest: ignore tests on a per-revision basis Otherwise something that ought to seemingly work like `//[x86] needs-llvm-components: x86` or `//[nll_beyond]should-fail` do not get evaluated properly. --- src/test/ui/asm/inline-syntax.arm.stderr | 12 +- src/test/ui/asm/inline-syntax.x86_64.stderr | 14 +- ...-phase-reservation-sharing-interference.rs | 4 +- .../params-on-registers.rs | 14 +- .../cmse-nonsecure-call/params-on-stack.rs | 3 +- .../wrong-abi-location-1.rs | 6 +- .../wrong-abi-location-1.stderr | 8 +- .../wrong-abi-location-2.rs | 6 +- .../wrong-abi-location-2.stderr | 4 +- .../params-on-registers.rs | 12 +- .../cmse-nonsecure-entry/params-on-stack.rs | 1 + .../cmse-nonsecure-entry/wrong-abi.rs | 11 +- .../cmse-nonsecure-entry/wrong-abi.stderr | 4 +- src/test/ui/crate-loading/missing-std.stderr | 2 +- src/tools/compiletest/src/header.rs | 462 ++++++++---------- src/tools/compiletest/src/header/tests.rs | 113 +++-- src/tools/compiletest/src/main.rs | 64 +-- 17 files changed, 357 insertions(+), 383 deletions(-) diff --git a/src/test/ui/asm/inline-syntax.arm.stderr b/src/test/ui/asm/inline-syntax.arm.stderr index b1685bd4e02..bf6ea6b67f9 100644 --- a/src/test/ui/asm/inline-syntax.arm.stderr +++ b/src/test/ui/asm/inline-syntax.arm.stderr @@ -13,7 +13,7 @@ LL | .intel_syntax noprefix | ^ error: unknown directive - --> $DIR/inline-syntax.rs:29:15 + --> $DIR/inline-syntax.rs:31:15 | LL | asm!(".intel_syntax noprefix", "nop"); | ^ @@ -25,7 +25,7 @@ LL | .intel_syntax noprefix | ^ error: unknown directive - --> $DIR/inline-syntax.rs:32:15 + --> $DIR/inline-syntax.rs:34:15 | LL | asm!(".intel_syntax aaa noprefix", "nop"); | ^ @@ -37,7 +37,7 @@ LL | .intel_syntax aaa noprefix | ^ error: unknown directive - --> $DIR/inline-syntax.rs:35:15 + --> $DIR/inline-syntax.rs:37:15 | LL | asm!(".att_syntax noprefix", "nop"); | ^ @@ -49,7 +49,7 @@ LL | .att_syntax noprefix | ^ error: unknown directive - --> $DIR/inline-syntax.rs:38:15 + --> $DIR/inline-syntax.rs:40:15 | LL | asm!(".att_syntax bbb noprefix", "nop"); | ^ @@ -61,7 +61,7 @@ LL | .att_syntax bbb noprefix | ^ error: unknown directive - --> $DIR/inline-syntax.rs:41:15 + --> $DIR/inline-syntax.rs:43:15 | LL | asm!(".intel_syntax noprefix; nop"); | ^ @@ -73,7 +73,7 @@ LL | .intel_syntax noprefix; nop | ^ error: unknown directive - --> $DIR/inline-syntax.rs:47:13 + --> $DIR/inline-syntax.rs:49:13 | LL | .intel_syntax noprefix | ^ diff --git a/src/test/ui/asm/inline-syntax.x86_64.stderr b/src/test/ui/asm/inline-syntax.x86_64.stderr index 59c95194322..dcbc17bb260 100644 --- a/src/test/ui/asm/inline-syntax.x86_64.stderr +++ b/src/test/ui/asm/inline-syntax.x86_64.stderr @@ -1,5 +1,5 @@ warning: avoid using `.intel_syntax`, Intel syntax is the default - --> $DIR/inline-syntax.rs:55:14 + --> $DIR/inline-syntax.rs:57:14 | LL | global_asm!(".intel_syntax noprefix", "nop"); | ^^^^^^^^^^^^^^^^^^^^^^ @@ -7,37 +7,37 @@ LL | global_asm!(".intel_syntax noprefix", "nop"); = note: `#[warn(bad_asm_style)]` on by default warning: avoid using `.intel_syntax`, Intel syntax is the default - --> $DIR/inline-syntax.rs:29:15 + --> $DIR/inline-syntax.rs:31:15 | LL | asm!(".intel_syntax noprefix", "nop"); | ^^^^^^^^^^^^^^^^^^^^^^ warning: avoid using `.intel_syntax`, Intel syntax is the default - --> $DIR/inline-syntax.rs:32:15 + --> $DIR/inline-syntax.rs:34:15 | LL | asm!(".intel_syntax aaa noprefix", "nop"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: avoid using `.att_syntax`, prefer using `options(att_syntax)` instead - --> $DIR/inline-syntax.rs:35:15 + --> $DIR/inline-syntax.rs:37:15 | LL | asm!(".att_syntax noprefix", "nop"); | ^^^^^^^^^^^^^^^^^^^^ warning: avoid using `.att_syntax`, prefer using `options(att_syntax)` instead - --> $DIR/inline-syntax.rs:38:15 + --> $DIR/inline-syntax.rs:40:15 | LL | asm!(".att_syntax bbb noprefix", "nop"); | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: avoid using `.intel_syntax`, Intel syntax is the default - --> $DIR/inline-syntax.rs:41:15 + --> $DIR/inline-syntax.rs:43:15 | LL | asm!(".intel_syntax noprefix; nop"); | ^^^^^^^^^^^^^^^^^^^^^^ warning: avoid using `.intel_syntax`, Intel syntax is the default - --> $DIR/inline-syntax.rs:47:13 + --> $DIR/inline-syntax.rs:49:13 | LL | .intel_syntax noprefix | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference.rs b/src/test/ui/borrowck/two-phase-reservation-sharing-interference.rs index f7392bfeaab..50248a55838 100644 --- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference.rs +++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference.rs @@ -1,8 +1,8 @@ // revisions: nll_target -// The following revisions are disabled due to missing support from two-phase beyond autorefs +// The nll_beyond revision is disabled due to missing support from two-phase beyond autorefs //[nll_beyond]compile-flags: -Z borrowck=mir -Z two-phase-beyond-autoref -//[nll_beyond] should-fail +//[nll_beyond]should-fail //[nll_target]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-registers.rs b/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-registers.rs index 247efc055d9..9e4521df8c3 100644 --- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-registers.rs +++ b/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-registers.rs @@ -1,13 +1,21 @@ // build-pass // compile-flags: --target thumbv8m.main-none-eabi --crate-type lib // needs-llvm-components: arm -#![feature(abi_c_cmse_nonsecure_call)] -#![no_std] +#![feature(abi_c_cmse_nonsecure_call, no_core, lang_items, intrinsics)] +#![no_core] +#[lang="sized"] +pub trait Sized { } +#[lang="copy"] +pub trait Copy { } + +extern "rust-intrinsic" { + pub fn transmute(e: T) -> U; +} #[no_mangle] pub fn test(a: u32, b: u32, c: u32, d: u32) -> u32 { let non_secure_function = unsafe { - core::mem::transmute:: u32>( + transmute:: u32>( 0x10000004, ) }; diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.rs b/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.rs index 52c0e3a2165..9697146d5c3 100644 --- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.rs +++ b/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.rs @@ -1,3 +1,4 @@ +// build-fail // compile-flags: --target thumbv8m.main-none-eabi --crate-type lib // needs-llvm-components: arm // min-llvm-version: 11.0 @@ -15,7 +16,7 @@ extern "rust-intrinsic" { #[no_mangle] pub fn test(a: u32, b: u32, c: u32, d: u32, e: u32) -> u32 { let non_secure_function = unsafe { - core::mem::transmute::< + transmute::< usize, extern "C-cmse-nonsecure-call" fn(u32, u32, u32, u32, u32) -> u32> ( diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.rs b/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.rs index a838d34a118..f32b3709002 100644 --- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.rs +++ b/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.rs @@ -1,6 +1,8 @@ // compile-flags: --target thumbv8m.main-none-eabi --crate-type lib // needs-llvm-components: arm -#![feature(abi_c_cmse_nonsecure_call)] -#![no_std] +#![feature(abi_c_cmse_nonsecure_call, lang_items, no_core)] +#![no_core] +#[lang="sized"] +trait Sized { } pub extern "C-cmse-nonsecure-call" fn test() {} //~ ERROR [E0781] diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.stderr b/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.stderr index 78490bf8f68..3564ab4b6cd 100644 --- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.stderr +++ b/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.stderr @@ -1,8 +1,8 @@ -error[E0781]: the `"cmse-nonsecure-call"` ABI is only allowed on function pointers. - --> $DIR/wrong-abi-location-1.rs:6:1 +error[E0781]: the `"C-cmse-nonsecure-call"` ABI is only allowed on function pointers. + --> $DIR/wrong-abi-location-1.rs:8:1 | -LL | pub extern "C-cmse-nonsecure-call" fn test() {} //~ ERROR [E0781] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +LL | pub extern "C-cmse-nonsecure-call" fn test() {} + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.rs b/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.rs index 15bb618f6ad..6f8bb24aa69 100644 --- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.rs +++ b/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.rs @@ -1,7 +1,9 @@ // compile-flags: --target thumbv8m.main-none-eabi --crate-type lib // needs-llvm-components: arm -#![feature(abi_c_cmse_nonsecure_call)] -#![no_std] +#![feature(abi_c_cmse_nonsecure_call, lang_items, no_core)] +#![no_core] +#[lang="sized"] +trait Sized { } extern "C-cmse-nonsecure-call" { //~ ERROR [E0781] fn test(); diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.stderr b/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.stderr index 5c148e2cd6f..76073f54884 100644 --- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.stderr +++ b/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.stderr @@ -1,8 +1,8 @@ error[E0781]: the `"C-cmse-nonsecure-call"` ABI is only allowed on function pointers. - --> $DIR/wrong-abi-location-2.rs:6:1 + --> $DIR/wrong-abi-location-2.rs:8:1 | LL | / extern "C-cmse-nonsecure-call" { -LL | | fn test(); //~ ERROR [E0781] +LL | | fn test(); LL | | } | |_^ diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-registers.rs b/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-registers.rs index 866f5416ad4..8cde9ba58b9 100644 --- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-registers.rs +++ b/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-registers.rs @@ -1,11 +1,15 @@ // build-pass // compile-flags: --target thumbv8m.main-none-eabi --crate-type lib // needs-llvm-components: arm -#![feature(cmse_nonsecure_entry)] -#![no_std] +#![feature(cmse_nonsecure_entry, no_core, lang_items)] +#![no_core] +#[lang="sized"] +trait Sized { } +#[lang="copy"] +trait Copy { } #[no_mangle] #[cmse_nonsecure_entry] -pub extern "C" fn entry_function(a: u32, b: u32, c: u32, d: u32) -> u32 { - a + b + c + d +pub extern "C" fn entry_function(_: u32, _: u32, _: u32, d: u32) -> u32 { + d } diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-stack.rs b/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-stack.rs index b01031f035e..74321fdfdde 100644 --- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-stack.rs +++ b/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-stack.rs @@ -1,3 +1,4 @@ +// build-fail // compile-flags: --target thumbv8m.main-none-eabi --crate-type lib // needs-llvm-components: arm // min-llvm-version: 11.0 diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.rs b/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.rs index da8abe77777..6320d296373 100644 --- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.rs +++ b/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.rs @@ -1,10 +1,13 @@ // compile-flags: --target thumbv8m.main-none-eabi --crate-type lib // needs-llvm-components: arm -#![feature(cmse_nonsecure_entry)] -#![no_std] +#![feature(cmse_nonsecure_entry, no_core, lang_items)] +#![no_core] +#[lang="sized"] +trait Sized { } #[no_mangle] #[cmse_nonsecure_entry] -pub fn entry_function(a: u32, b: u32, c: u32, d: u32) -> u32 { //~ ERROR [E0776] - a + b + c + d +//~^ ERROR `#[cmse_nonsecure_entry]` requires C ABI [E0776] +pub fn entry_function(_: u32, _: u32, _: u32, d: u32) -> u32 { + d } diff --git a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.stderr b/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.stderr index d6967a11e6b..36d76c9674a 100644 --- a/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.stderr +++ b/src/test/ui/cmse-nonsecure/cmse-nonsecure-entry/wrong-abi.stderr @@ -1,5 +1,5 @@ -error[E0776]: `#[cmse_nonsecure_entry]` functions require C ABI - --> $DIR/wrong-abi.rs:7:1 +error[E0776]: `#[cmse_nonsecure_entry]` requires C ABI + --> $DIR/wrong-abi.rs:9:1 | LL | #[cmse_nonsecure_entry] | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/crate-loading/missing-std.stderr b/src/test/ui/crate-loading/missing-std.stderr index 25808efdfa6..e61486fdc6f 100644 --- a/src/test/ui/crate-loading/missing-std.stderr +++ b/src/test/ui/crate-loading/missing-std.stderr @@ -1,5 +1,5 @@ error[E0463]: can't find crate for `core` - --> $DIR/missing-std.rs:5:1 + --> $DIR/missing-std.rs:6:1 | LL | extern crate core; | ^^^^^^^^^^^^^^^^^^ can't find crate diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 26c1710be74..764f2055277 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -27,8 +27,6 @@ enum ParsedNameDirective { /// the test. #[derive(Default)] pub struct EarlyProps { - pub ignore: bool, - pub should_fail: bool, pub aux: Vec, pub aux_crate: Vec<(String, String)>, pub revisions: Vec, @@ -36,251 +34,22 @@ pub struct EarlyProps { impl EarlyProps { pub fn from_file(config: &Config, testfile: &Path) -> Self { - let file = File::open(testfile).unwrap(); + let file = File::open(testfile).expect("open test file to parse earlyprops"); Self::from_reader(config, testfile, file) } pub fn from_reader(config: &Config, testfile: &Path, rdr: R) -> Self { let mut props = EarlyProps::default(); - 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 has_asm_support = util::has_asm_support(&config.target); - let has_asan = util::ASAN_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_tsan = util::TSAN_SUPPORTED_TARGETS.contains(&&*config.target); - let has_hwasan = util::HWASAN_SUPPORTED_TARGETS.contains(&&*config.target); - // for `-Z gcc-ld=lld` - let has_rust_lld = config - .compile_lib_path - .join("rustlib") - .join(&config.target) - .join("bin") - .join("gcc-ld") - .join(if config.host.contains("windows") { "ld.exe" } else { "ld" }) - .exists(); - - iter_header(testfile, None, rdr, &mut |ln| { - // we should check if any only- exists and if it exists - // and does not matches the current platform, skip the test - if !props.ignore { - props.ignore = match config.parse_cfg_name_directive(ln, "ignore") { - ParsedNameDirective::Match => true, - ParsedNameDirective::NoMatch => props.ignore, - }; - - if config.has_cfg_prefix(ln, "only") { - props.ignore = match config.parse_cfg_name_directive(ln, "only") { - ParsedNameDirective::Match => props.ignore, - ParsedNameDirective::NoMatch => true, - }; - } - - if ignore_llvm(config, ln) { - props.ignore = true; - } - - if config.run_clang_based_tests_with.is_none() - && config.parse_needs_matching_clang(ln) - { - 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) { - props.ignore = true; - } - - if !config.run_enabled() && config.parse_name_directive(ln, "needs-run-enabled") { - props.ignore = true; - } - - if !rustc_has_sanitizer_support - && config.parse_name_directive(ln, "needs-sanitizer-support") - { - props.ignore = true; - } - - if !has_asan && config.parse_name_directive(ln, "needs-sanitizer-address") { - props.ignore = true; - } - - if !has_lsan && config.parse_name_directive(ln, "needs-sanitizer-leak") { - props.ignore = true; - } - - if !has_msan && config.parse_name_directive(ln, "needs-sanitizer-memory") { - props.ignore = true; - } - - if !has_tsan && config.parse_name_directive(ln, "needs-sanitizer-thread") { - props.ignore = true; - } - - if !has_hwasan && config.parse_name_directive(ln, "needs-sanitizer-hwaddress") { - props.ignore = true; - } - - if config.target_panic == PanicStrategy::Abort - && config.parse_name_directive(ln, "needs-unwind") - { - props.ignore = true; - } - - if config.target == "wasm32-unknown-unknown" && config.parse_check_run_results(ln) { - props.ignore = true; - } - - if config.debugger == Some(Debugger::Cdb) && ignore_cdb(config, ln) { - props.ignore = true; - } - - if config.debugger == Some(Debugger::Gdb) && ignore_gdb(config, ln) { - props.ignore = true; - } - - if config.debugger == Some(Debugger::Lldb) && ignore_lldb(config, ln) { - props.ignore = true; - } - - if !has_rust_lld && config.parse_name_directive(ln, "needs-rust-lld") { - props.ignore = true; - } - } - + iter_header(testfile, rdr, &mut |_, ln| { if let Some(s) = config.parse_aux_build(ln) { props.aux.push(s); } - if let Some(ac) = config.parse_aux_crate(ln) { props.aux_crate.push(ac); } - config.parse_and_update_revisions(ln, &mut props.revisions); - - props.should_fail = props.should_fail || config.parse_name_directive(ln, "should-fail"); }); - return props; - - fn ignore_cdb(config: &Config, line: &str) -> bool { - if let Some(actual_version) = config.cdb_version { - if let Some(min_version) = line.strip_prefix("min-cdb-version:").map(str::trim) { - let min_version = extract_cdb_version(min_version).unwrap_or_else(|| { - panic!("couldn't parse version range: {:?}", min_version); - }); - - // Ignore if actual version is smaller than the minimum - // required version - return actual_version < min_version; - } - } - false - } - - fn ignore_gdb(config: &Config, line: &str) -> bool { - if let Some(actual_version) = config.gdb_version { - if let Some(rest) = line.strip_prefix("min-gdb-version:").map(str::trim) { - let (start_ver, end_ver) = extract_version_range(rest, extract_gdb_version) - .unwrap_or_else(|| { - panic!("couldn't parse version range: {:?}", rest); - }); - - if start_ver != end_ver { - panic!("Expected single GDB version") - } - // Ignore if actual version is smaller than the minimum - // required version - return actual_version < start_ver; - } else if let Some(rest) = line.strip_prefix("ignore-gdb-version:").map(str::trim) { - let (min_version, max_version) = - extract_version_range(rest, extract_gdb_version).unwrap_or_else(|| { - panic!("couldn't parse version range: {:?}", rest); - }); - - if max_version < min_version { - panic!("Malformed GDB version range: max < min") - } - - return actual_version >= min_version && actual_version <= max_version; - } - } - false - } - - fn ignore_lldb(config: &Config, line: &str) -> bool { - if let Some(actual_version) = config.lldb_version { - if let Some(min_version) = line.strip_prefix("min-lldb-version:").map(str::trim) { - let min_version = min_version.parse().unwrap_or_else(|e| { - panic!( - "Unexpected format of LLDB version string: {}\n{:?}", - min_version, e - ); - }); - // Ignore if actual version is smaller the minimum required - // version - actual_version < min_version - } else { - line.starts_with("rust-lldb") && !config.lldb_native_rust - } - } else { - false - } - } - - fn ignore_llvm(config: &Config, line: &str) -> bool { - if config.system_llvm && line.starts_with("no-system-llvm") { - return true; - } - if let Some(needed_components) = - config.parse_name_value_directive(line, "needs-llvm-components") - { - let components: HashSet<_> = config.llvm_components.split_whitespace().collect(); - if let Some(missing_component) = needed_components - .split_whitespace() - .find(|needed_component| !components.contains(needed_component)) - { - if env::var_os("COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS").is_some() { - panic!("missing LLVM component: {}", missing_component); - } - return true; - } - } - if let Some(actual_version) = config.llvm_version { - if let Some(rest) = line.strip_prefix("min-llvm-version:").map(str::trim) { - let min_version = extract_llvm_version(rest).unwrap(); - // Ignore if actual version is smaller the minimum required - // version - actual_version < min_version - } else if let Some(rest) = - line.strip_prefix("min-system-llvm-version:").map(str::trim) - { - let min_version = extract_llvm_version(rest).unwrap(); - // Ignore if using system LLVM and actual version - // is smaller the minimum required version - config.system_llvm && actual_version < min_version - } else if let Some(rest) = line.strip_prefix("ignore-llvm-version:").map(str::trim) - { - // Syntax is: "ignore-llvm-version: [- ]" - let (v_min, v_max) = extract_version_range(rest, extract_llvm_version) - .unwrap_or_else(|| { - panic!("couldn't parse version range: {:?}", rest); - }); - if v_max < v_min { - panic!("Malformed LLVM version range: max < min") - } - // Ignore if version lies inside of range. - actual_version >= v_min && actual_version <= v_max - } else { - false - } - } else { - false - } - } } } @@ -440,7 +209,11 @@ impl TestProps { if !testfile.is_dir() { let file = File::open(testfile).unwrap(); - iter_header(testfile, cfg, file, &mut |ln| { + iter_header(testfile, file, &mut |revision, ln| { + if revision.is_some() && revision != cfg { + return; + } + if let Some(ep) = config.parse_error_pattern(ln) { self.error_patterns.push(ep); } @@ -672,12 +445,12 @@ impl TestProps { } } -fn iter_header(testfile: &Path, cfg: Option<&str>, rdr: R, it: &mut dyn FnMut(&str)) { +fn iter_header(testfile: &Path, rdr: R, it: &mut dyn FnMut(Option<&str>, &str)) { if testfile.is_dir() { return; } - let comment = if testfile.to_string_lossy().ends_with(".rs") { "//" } else { "#" }; + let comment = if testfile.extension().map(|e| e == "rs") == Some(true) { "//" } else { "#" }; let mut rdr = BufReader::new(rdr); let mut ln = String::new(); @@ -699,18 +472,12 @@ fn iter_header(testfile: &Path, cfg: Option<&str>, rdr: R, it: &mut dyn if let Some(close_brace) = ln.find(']') { let open_brace = ln.find('[').unwrap(); let lncfg = &ln[open_brace + 1..close_brace]; - let matches = match cfg { - Some(s) => s == &lncfg[..], - None => false, - }; - if matches { - it(ln[(close_brace + 1)..].trim_start()); - } + it(Some(lncfg), ln[(close_brace + 1)..].trim_start()); } else { panic!("malformed condition directive: expected `{}[foo]`, found `{}`", comment, ln) } } else if ln.starts_with(comment) { - it(ln[comment.len()..].trim_start()); + it(None, ln[comment.len()..].trim_start()); } } } @@ -1026,11 +793,12 @@ pub fn extract_llvm_version(version: &str) -> Option { Some(version) } -// Takes a directive of the form " [- ]", -// returns the numeric representation of and as -// tuple: ( as u32, as u32) -// If the part is omitted, the second component of the tuple -// is the same as . +/// Takes a directive of the form " [- ]", +/// returns the numeric representation of and as +/// tuple: ( as u32, as u32) +/// +/// If the part is omitted, the second component of the tuple +/// is the same as . fn extract_version_range(line: &str, parse: F) -> Option<(u32, u32)> where F: Fn(&str) -> Option, @@ -1056,3 +824,199 @@ where Some((min, max)) } + +pub fn make_test_description( + config: &Config, + name: test::TestName, + path: &Path, + src: R, + cfg: Option<&str>, +) -> test::TestDesc { + let mut ignore = false; + let mut should_fail = false; + + 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 has_asm_support = util::has_asm_support(&config.target); + let has_asan = util::ASAN_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_tsan = util::TSAN_SUPPORTED_TARGETS.contains(&&*config.target); + let has_hwasan = util::HWASAN_SUPPORTED_TARGETS.contains(&&*config.target); + // for `-Z gcc-ld=lld` + let has_rust_lld = config + .compile_lib_path + .join("rustlib") + .join(&config.target) + .join("bin") + .join("gcc-ld") + .join(if config.host.contains("windows") { "ld.exe" } else { "ld" }) + .exists(); + iter_header(path, src, &mut |revision, ln| { + if revision.is_some() && revision != cfg { + return; + } + ignore = match config.parse_cfg_name_directive(ln, "ignore") { + ParsedNameDirective::Match => true, + ParsedNameDirective::NoMatch => ignore, + }; + if config.has_cfg_prefix(ln, "only") { + ignore = match config.parse_cfg_name_directive(ln, "only") { + ParsedNameDirective::Match => ignore, + ParsedNameDirective::NoMatch => true, + }; + } + ignore |= ignore_llvm(config, ln); + ignore |= + config.run_clang_based_tests_with.is_none() && config.parse_needs_matching_clang(ln); + ignore |= !has_asm_support && config.parse_name_directive(ln, "needs-asm-support"); + ignore |= !rustc_has_profiler_support && config.parse_needs_profiler_support(ln); + ignore |= !config.run_enabled() && config.parse_name_directive(ln, "needs-run-enabled"); + ignore |= !rustc_has_sanitizer_support + && config.parse_name_directive(ln, "needs-sanitizer-support"); + ignore |= !has_asan && config.parse_name_directive(ln, "needs-sanitizer-address"); + ignore |= !has_lsan && config.parse_name_directive(ln, "needs-sanitizer-leak"); + ignore |= !has_msan && config.parse_name_directive(ln, "needs-sanitizer-memory"); + ignore |= !has_tsan && config.parse_name_directive(ln, "needs-sanitizer-thread"); + ignore |= !has_hwasan && config.parse_name_directive(ln, "needs-sanitizer-hwaddress"); + ignore |= config.target_panic == PanicStrategy::Abort + && config.parse_name_directive(ln, "needs-unwind"); + ignore |= config.target == "wasm32-unknown-unknown" && config.parse_check_run_results(ln); + ignore |= config.debugger == Some(Debugger::Cdb) && ignore_cdb(config, ln); + ignore |= config.debugger == Some(Debugger::Gdb) && ignore_gdb(config, ln); + ignore |= config.debugger == Some(Debugger::Lldb) && ignore_lldb(config, ln); + ignore |= !has_rust_lld && config.parse_name_directive(ln, "needs-rust-lld"); + should_fail |= config.parse_name_directive(ln, "should-fail"); + }); + + // The `should-fail` annotation doesn't apply to pretty tests, + // since we run the pretty printer across all tests by default. + // If desired, we could add a `should-fail-pretty` annotation. + let should_panic = match config.mode { + crate::common::Pretty => test::ShouldPanic::No, + _ if should_fail => test::ShouldPanic::Yes, + _ => test::ShouldPanic::No, + }; + + test::TestDesc { + name, + ignore, + should_panic, + allow_fail: false, + #[cfg(not(bootstrap))] + compile_fail: false, + #[cfg(not(bootstrap))] + no_run: false, + test_type: test::TestType::Unknown, + } +} + +fn ignore_cdb(config: &Config, line: &str) -> bool { + if let Some(actual_version) = config.cdb_version { + if let Some(min_version) = line.strip_prefix("min-cdb-version:").map(str::trim) { + let min_version = extract_cdb_version(min_version).unwrap_or_else(|| { + panic!("couldn't parse version range: {:?}", min_version); + }); + + // Ignore if actual version is smaller than the minimum + // required version + return actual_version < min_version; + } + } + false +} + +fn ignore_gdb(config: &Config, line: &str) -> bool { + if let Some(actual_version) = config.gdb_version { + if let Some(rest) = line.strip_prefix("min-gdb-version:").map(str::trim) { + let (start_ver, end_ver) = extract_version_range(rest, extract_gdb_version) + .unwrap_or_else(|| { + panic!("couldn't parse version range: {:?}", rest); + }); + + if start_ver != end_ver { + panic!("Expected single GDB version") + } + // Ignore if actual version is smaller than the minimum + // required version + return actual_version < start_ver; + } else if let Some(rest) = line.strip_prefix("ignore-gdb-version:").map(str::trim) { + let (min_version, max_version) = extract_version_range(rest, extract_gdb_version) + .unwrap_or_else(|| { + panic!("couldn't parse version range: {:?}", rest); + }); + + if max_version < min_version { + panic!("Malformed GDB version range: max < min") + } + + return actual_version >= min_version && actual_version <= max_version; + } + } + false +} + +fn ignore_lldb(config: &Config, line: &str) -> bool { + if let Some(actual_version) = config.lldb_version { + if let Some(min_version) = line.strip_prefix("min-lldb-version:").map(str::trim) { + let min_version = min_version.parse().unwrap_or_else(|e| { + panic!("Unexpected format of LLDB version string: {}\n{:?}", min_version, e); + }); + // Ignore if actual version is smaller the minimum required + // version + actual_version < min_version + } else { + line.starts_with("rust-lldb") && !config.lldb_native_rust + } + } else { + false + } +} + +fn ignore_llvm(config: &Config, line: &str) -> bool { + if config.system_llvm && line.starts_with("no-system-llvm") { + return true; + } + if let Some(needed_components) = + config.parse_name_value_directive(line, "needs-llvm-components") + { + let components: HashSet<_> = config.llvm_components.split_whitespace().collect(); + if let Some(missing_component) = needed_components + .split_whitespace() + .find(|needed_component| !components.contains(needed_component)) + { + if env::var_os("COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS").is_some() { + panic!("missing LLVM component: {}", missing_component); + } + return true; + } + } + if let Some(actual_version) = config.llvm_version { + if let Some(rest) = line.strip_prefix("min-llvm-version:").map(str::trim) { + let min_version = extract_llvm_version(rest).unwrap(); + // Ignore if actual version is smaller the minimum required + // version + actual_version < min_version + } else if let Some(rest) = line.strip_prefix("min-system-llvm-version:").map(str::trim) { + let min_version = extract_llvm_version(rest).unwrap(); + // Ignore if using system LLVM and actual version + // is smaller the minimum required version + config.system_llvm && actual_version < min_version + } else if let Some(rest) = line.strip_prefix("ignore-llvm-version:").map(str::trim) { + // Syntax is: "ignore-llvm-version: [- ]" + let (v_min, v_max) = + extract_version_range(rest, extract_llvm_version).unwrap_or_else(|| { + panic!("couldn't parse version range: {:?}", rest); + }); + if v_max < v_min { + panic!("Malformed LLVM version range: max < min") + } + // Ignore if version lies inside of range. + actual_version >= v_min && actual_version <= v_max + } else { + false + } + } else { + false + } +} diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs index 2c607b6a50e..2485dbadab5 100644 --- a/src/tools/compiletest/src/header/tests.rs +++ b/src/tools/compiletest/src/header/tests.rs @@ -1,7 +1,7 @@ use std::path::Path; use crate::common::{Config, Debugger}; -use crate::header::{parse_normalization_string, EarlyProps}; +use crate::header::{make_test_description, parse_normalization_string, EarlyProps}; #[test] fn test_parse_normalization_string() { @@ -66,6 +66,13 @@ fn parse_rs(config: &Config, contents: &str) -> EarlyProps { EarlyProps::from_reader(config, Path::new("a.rs"), bytes) } +fn check_ignore(config: &Config, contents: &str) -> bool { + let tn = test::DynTestName(String::new()); + let p = Path::new("a.rs"); + let d = make_test_description(&config, tn, p, std::io::Cursor::new(contents), None); + d.ignore +} + fn parse_makefile(config: &Config, contents: &str) -> EarlyProps { let bytes = contents.as_bytes(); EarlyProps::from_reader(config, Path::new("Makefile"), bytes) @@ -74,9 +81,13 @@ fn parse_makefile(config: &Config, contents: &str) -> EarlyProps { #[test] fn should_fail() { let config = config(); + let tn = test::DynTestName(String::new()); + let p = Path::new("a.rs"); - assert!(!parse_rs(&config, "").should_fail); - assert!(parse_rs(&config, "// should-fail").should_fail); + let d = make_test_description(&config, tn.clone(), p, std::io::Cursor::new(""), None); + assert_eq!(d.should_panic, test::ShouldPanic::No); + let d = make_test_description(&config, tn, p, std::io::Cursor::new("// should-fail"), None); + assert_eq!(d.should_panic, test::ShouldPanic::Yes); } #[test] @@ -112,10 +123,10 @@ fn no_system_llvm() { let mut config = config(); config.system_llvm = false; - assert!(!parse_rs(&config, "// no-system-llvm").ignore); + assert!(!check_ignore(&config, "// no-system-llvm")); config.system_llvm = true; - assert!(parse_rs(&config, "// no-system-llvm").ignore); + assert!(check_ignore(&config, "// no-system-llvm")); } #[test] @@ -123,16 +134,16 @@ fn llvm_version() { let mut config = config(); config.llvm_version = Some(80102); - assert!(parse_rs(&config, "// min-llvm-version: 9.0").ignore); + assert!(check_ignore(&config, "// min-llvm-version: 9.0")); config.llvm_version = Some(90001); - assert!(parse_rs(&config, "// min-llvm-version: 9.2").ignore); + assert!(check_ignore(&config, "// min-llvm-version: 9.2")); config.llvm_version = Some(90301); - assert!(!parse_rs(&config, "// min-llvm-version: 9.2").ignore); + assert!(!check_ignore(&config, "// min-llvm-version: 9.2")); config.llvm_version = Some(100000); - assert!(!parse_rs(&config, "// min-llvm-version: 9.0").ignore); + assert!(!check_ignore(&config, "// min-llvm-version: 9.0")); } #[test] @@ -140,16 +151,16 @@ fn ignore_target() { let mut config = config(); config.target = "x86_64-unknown-linux-gnu".to_owned(); - assert!(parse_rs(&config, "// ignore-x86_64-unknown-linux-gnu").ignore); - assert!(parse_rs(&config, "// ignore-x86_64").ignore); - assert!(parse_rs(&config, "// ignore-linux").ignore); - assert!(parse_rs(&config, "// ignore-gnu").ignore); - assert!(parse_rs(&config, "// ignore-64bit").ignore); + assert!(check_ignore(&config, "// ignore-x86_64-unknown-linux-gnu")); + assert!(check_ignore(&config, "// ignore-x86_64")); + assert!(check_ignore(&config, "// ignore-linux")); + assert!(check_ignore(&config, "// ignore-gnu")); + assert!(check_ignore(&config, "// ignore-64bit")); - assert!(!parse_rs(&config, "// ignore-i686").ignore); - assert!(!parse_rs(&config, "// ignore-windows").ignore); - assert!(!parse_rs(&config, "// ignore-msvc").ignore); - assert!(!parse_rs(&config, "// ignore-32bit").ignore); + assert!(!check_ignore(&config, "// ignore-i686")); + assert!(!check_ignore(&config, "// ignore-windows")); + assert!(!check_ignore(&config, "// ignore-msvc")); + assert!(!check_ignore(&config, "// ignore-32bit")); } #[test] @@ -157,16 +168,16 @@ fn only_target() { let mut config = config(); config.target = "x86_64-pc-windows-gnu".to_owned(); - assert!(parse_rs(&config, "// only-i686").ignore); - assert!(parse_rs(&config, "// only-linux").ignore); - assert!(parse_rs(&config, "// only-msvc").ignore); - assert!(parse_rs(&config, "// only-32bit").ignore); + assert!(check_ignore(&config, "// only-i686")); + assert!(check_ignore(&config, "// only-linux")); + assert!(check_ignore(&config, "// only-msvc")); + assert!(check_ignore(&config, "// only-32bit")); - assert!(!parse_rs(&config, "// only-x86_64-pc-windows-gnu").ignore); - assert!(!parse_rs(&config, "// only-x86_64").ignore); - assert!(!parse_rs(&config, "// only-windows").ignore); - assert!(!parse_rs(&config, "// only-gnu").ignore); - assert!(!parse_rs(&config, "// only-64bit").ignore); + assert!(!check_ignore(&config, "// only-x86_64-pc-windows-gnu")); + assert!(!check_ignore(&config, "// only-x86_64")); + assert!(!check_ignore(&config, "// only-windows")); + assert!(!check_ignore(&config, "// only-gnu")); + assert!(!check_ignore(&config, "// only-64bit")); } #[test] @@ -174,8 +185,8 @@ fn stage() { let mut config = config(); config.stage_id = "stage1".to_owned(); - assert!(parse_rs(&config, "// ignore-stage1").ignore); - assert!(!parse_rs(&config, "// ignore-stage2").ignore); + assert!(check_ignore(&config, "// ignore-stage1")); + assert!(!check_ignore(&config, "// ignore-stage2")); } #[test] @@ -183,26 +194,26 @@ fn cross_compile() { let mut config = config(); config.host = "x86_64-apple-darwin".to_owned(); config.target = "wasm32-unknown-unknown".to_owned(); - assert!(parse_rs(&config, "// ignore-cross-compile").ignore); + assert!(check_ignore(&config, "// ignore-cross-compile")); config.target = config.host.clone(); - assert!(!parse_rs(&config, "// ignore-cross-compile").ignore); + assert!(!check_ignore(&config, "// ignore-cross-compile")); } #[test] fn debugger() { let mut config = config(); config.debugger = None; - assert!(!parse_rs(&config, "// ignore-cdb").ignore); + assert!(!check_ignore(&config, "// ignore-cdb")); config.debugger = Some(Debugger::Cdb); - assert!(parse_rs(&config, "// ignore-cdb").ignore); + assert!(check_ignore(&config, "// ignore-cdb")); config.debugger = Some(Debugger::Gdb); - assert!(parse_rs(&config, "// ignore-gdb").ignore); + assert!(check_ignore(&config, "// ignore-gdb")); config.debugger = Some(Debugger::Lldb); - assert!(parse_rs(&config, "// ignore-lldb").ignore); + assert!(check_ignore(&config, "// ignore-lldb")); } #[test] @@ -211,17 +222,17 @@ fn sanitizers() { // Target that supports all sanitizers: config.target = "x86_64-unknown-linux-gnu".to_owned(); - assert!(!parse_rs(&config, "// needs-sanitizer-address").ignore); - assert!(!parse_rs(&config, "// needs-sanitizer-leak").ignore); - assert!(!parse_rs(&config, "// needs-sanitizer-memory").ignore); - assert!(!parse_rs(&config, "// needs-sanitizer-thread").ignore); + assert!(!check_ignore(&config, "// needs-sanitizer-address")); + assert!(!check_ignore(&config, "// needs-sanitizer-leak")); + assert!(!check_ignore(&config, "// needs-sanitizer-memory")); + assert!(!check_ignore(&config, "// needs-sanitizer-thread")); // Target that doesn't support sanitizers: config.target = "wasm32-unknown-emscripten".to_owned(); - assert!(parse_rs(&config, "// needs-sanitizer-address").ignore); - assert!(parse_rs(&config, "// needs-sanitizer-leak").ignore); - assert!(parse_rs(&config, "// needs-sanitizer-memory").ignore); - assert!(parse_rs(&config, "// needs-sanitizer-thread").ignore); + assert!(check_ignore(&config, "// needs-sanitizer-address")); + assert!(check_ignore(&config, "// needs-sanitizer-leak")); + assert!(check_ignore(&config, "// needs-sanitizer-memory")); + assert!(check_ignore(&config, "// needs-sanitizer-thread")); } #[test] @@ -229,10 +240,10 @@ fn asm_support() { let mut config = config(); config.target = "avr-unknown-gnu-atmega328".to_owned(); - assert!(parse_rs(&config, "// needs-asm-support").ignore); + assert!(check_ignore(&config, "// needs-asm-support")); config.target = "i686-unknown-netbsd".to_owned(); - assert!(!parse_rs(&config, "// needs-asm-support").ignore); + assert!(!check_ignore(&config, "// needs-asm-support")); } #[test] @@ -240,13 +251,13 @@ fn channel() { let mut config = config(); config.channel = "beta".into(); - assert!(parse_rs(&config, "// ignore-beta").ignore); - assert!(parse_rs(&config, "// only-nightly").ignore); - assert!(parse_rs(&config, "// only-stable").ignore); + assert!(check_ignore(&config, "// ignore-beta")); + assert!(check_ignore(&config, "// only-nightly")); + assert!(check_ignore(&config, "// only-stable")); - assert!(!parse_rs(&config, "// only-beta").ignore); - assert!(!parse_rs(&config, "// ignore-nightly").ignore); - assert!(!parse_rs(&config, "// ignore-stable").ignore); + assert!(!check_ignore(&config, "// only-beta")); + assert!(!check_ignore(&config, "// ignore-nightly")); + assert!(!check_ignore(&config, "// ignore-stable")); } #[test] diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index c854663706a..46432d5e4f5 100644 --- a/src/tools/compiletest/src/main.rs +++ b/src/tools/compiletest/src/main.rs @@ -8,7 +8,7 @@ extern crate test; use crate::common::{ expected_output_path, output_base_dir, output_relative_path, PanicStrategy, UI_EXTENSIONS, }; -use crate::common::{CompareMode, Config, Debugger, Mode, PassMode, Pretty, TestPaths}; +use crate::common::{CompareMode, Config, Debugger, Mode, PassMode, TestPaths}; use crate::util::logv; use getopts::Options; use std::env; @@ -22,7 +22,7 @@ use test::ColorConfig; use tracing::*; use walkdir::WalkDir; -use self::header::EarlyProps; +use self::header::{make_test_description, EarlyProps}; #[cfg(test)] mod tests; @@ -620,26 +620,13 @@ pub fn is_test(file_name: &OsString) -> bool { } fn make_test(config: &Config, testpaths: &TestPaths, inputs: &Stamp) -> Vec { - let early_props = if config.mode == Mode::RunMake { - // Allow `ignore` directives to be in the Makefile. - EarlyProps::from_file(config, &testpaths.file.join("Makefile")) + let test_path = if config.mode == Mode::RunMake { + // Parse directives in the Makefile + testpaths.file.join("Makefile") } else { - EarlyProps::from_file(config, &testpaths.file) - }; - - // The `should-fail` annotation doesn't apply to pretty tests, - // since we run the pretty printer across all tests by default. - // If desired, we could add a `should-fail-pretty` annotation. - let should_panic = match config.mode { - Pretty => test::ShouldPanic::No, - _ => { - if early_props.should_fail { - test::ShouldPanic::Yes - } else { - test::ShouldPanic::No - } - } + PathBuf::from(&testpaths.file) }; + let early_props = EarlyProps::from_file(config, &test_path); // Incremental tests are special, they inherently cannot be run in parallel. // `runtest::run` will be responsible for iterating over revisions. @@ -651,29 +638,20 @@ fn make_test(config: &Config, testpaths: &TestPaths, inputs: &Stamp) -> Vec