Skip to content

Commit dae6b19

Browse files
committed
Remove ignore-uefi from tests
Do not ignore any tests for UEFI unless they do not fail gracefully. This should help reduce the surface area of this PR by a lot. Maybe think about ignoring them once this PR is merged. Signed-off-by: Ayush Singh <[email protected]>
1 parent d343822 commit dae6b19

File tree

210 files changed

+32
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+32
-231
lines changed

library/std/src/sys/uefi/stdio.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,6 @@ impl Stderr {
159159

160160
impl io::Write for Stderr {
161161
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
162-
// Since wrtiting to stderr might be tried due to a panic caused by unintialized GLOBALS,
163-
// this check ensures we do not cause an inifinte panic loop.
164-
if !uefi::env::GLOBALS.is_completed() {
165-
return Err(io::const_io_error!(io::ErrorKind::Other, "Globals not intialized"));
166-
}
167-
168162
if let Some(command_protocol) = common::get_current_handle_protocol::<
169163
uefi_command_protocol::Protocol,
170164
>(uefi_command_protocol::PROTOCOL_GUID)
@@ -193,7 +187,7 @@ pub fn is_ebadf(err: &io::Error) -> bool {
193187

194188
#[inline]
195189
pub fn panic_output() -> Option<impl io::Write> {
196-
Some(Stderr::new())
190+
if uefi::env::GLOBALS.is_completed() { Some(Stderr::new()) } else { None }
197191
}
198192

199193
fn utf8_to_ucs2(buf: &[u8], output: &mut [u16]) -> io::Result<usize> {

src/test/ui/abi/abi-sysv64-arg-passing.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
// ignore-arm
2929
// ignore-aarch64
3030
// ignore-windows
31-
// ignore-uefi rust_test_helpers do not work
3231

3332
// note: windows is ignored as rust_test_helpers does not have the sysv64 abi on windows
3433

src/test/ui/abi/anon-extern-mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// run-pass
22
// pretty-expanded FIXME #23616
33
// ignore-wasm32-bare no libc to test ffi with
4-
// ignore-uefi no libc to test ffi with
54

65
#![feature(rustc_private)]
76

src/test/ui/abi/c-stack-as-value.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// run-pass
22
// pretty-expanded FIXME #23616
33
// ignore-wasm32-bare no libc to test ffi with
4-
// ignore-uefi no libc to test ffi with
54

65
#![feature(rustc_private)]
76

src/test/ui/abi/c-stack-returning-int64.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// run-pass
22
// ignore-wasm32-bare no libc to test with
33
// ignore-sgx no libc
4-
// ignore-uefi no libc
54

65
#![feature(rustc_private)]
76

src/test/ui/abi/cabi-int-widening.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// ignore-wasm32-bare no libc to test ffi with
3-
// ignore-uefi no rust_test_helpers
43

54
#[link(name = "rust_test_helpers", kind = "static")]
65
extern "C" {

src/test/ui/abi/cross-crate/anon-extern-mod-cross-crate-2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// aux-build:anon-extern-mod-cross-crate-1.rs
33
// pretty-expanded FIXME #23616
44
// ignore-wasm32-bare no libc to test ffi with
5-
// ignore-uefi no libc to test ffi with
65

76
extern crate anonexternmod;
87

src/test/ui/abi/cross-crate/duplicated-external-mods.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// aux-build:anon-extern-mod-cross-crate-1.rs
44
// pretty-expanded FIXME #23616
55
// ignore-wasm32-bare no libc to test ffi with
6-
// ignore-uefi no libc to test ffi with
76

87
extern crate anonexternmod;
98

src/test/ui/abi/extern/extern-call-deep.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// ignore-wasm32-bare no libc to test ffi with
3-
// ignore-uefi no libc to test ffi with
43
// ignore-emscripten blows the JS stack
54

65
#![feature(rustc_private)]

src/test/ui/abi/extern/extern-call-deep2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// run-pass
22
#![allow(unused_must_use)]
33
// ignore-emscripten no threads support
4-
// ignore-uefi no threads support
54
#![feature(rustc_private)]
65

76
extern crate libc;

src/test/ui/abi/extern/extern-call-indirect.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// ignore-wasm32-bare no libc to test ffi with
3-
// ignore-uefi no libc to test ffi with
43

54
#![feature(rustc_private)]
65

src/test/ui/abi/extern/extern-call-scrub.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
// directions
66

77
// ignore-emscripten no threads support
8-
// ignore-uefi no threads support
98
#![feature(rustc_private)]
109

1110
extern crate libc;

src/test/ui/abi/extern/extern-crosscrate.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// run-pass
22
// aux-build:extern-crosscrate-source.rs
33
// ignore-wasm32-bare no libc to test ffi with
4-
// ignore-uefi no libc to test ffi with
54

65
#![feature(rustc_private)]
76

src/test/ui/abi/extern/extern-pass-TwoU16s.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![allow(improper_ctypes)]
33

44
// ignore-wasm32-bare no libc for ffi testing
5-
// ignore-uefi no rust_test_helpers
65

76
// Test a foreign function that accepts and returns a struct
87
// by value.

src/test/ui/abi/extern/extern-pass-TwoU32s.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![allow(improper_ctypes)]
33

44
// ignore-wasm32-bare no libc for ffi testing
5-
// ignore-uefi no rust_test_helpers
65

76
// Test a foreign function that accepts and returns a struct
87
// by value.

src/test/ui/abi/extern/extern-pass-TwoU64s.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![allow(improper_ctypes)]
33

44
// ignore-wasm32-bare no libc for ffi testing
5-
// ignore-uefi no rust_test_helpers
65

76
// Test a foreign function that accepts and returns a struct
87
// by value.

src/test/ui/abi/extern/extern-pass-TwoU8s.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![allow(improper_ctypes)]
33

44
// ignore-wasm32-bare no libc for ffi testing
5-
// ignore-uefi no rust_test_helpers
65

76
// Test a foreign function that accepts and returns a struct
87
// by value.

src/test/ui/abi/extern/extern-pass-char.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// ignore-wasm32-bare no libc for ffi testing
3-
// ignore-uefi no rust_test_helpers
43

54
// Test a function that takes/returns a u8.
65

src/test/ui/abi/extern/extern-pass-double.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// ignore-wasm32-bare no libc for ffi testing
3-
// ignore-uefi no rust_test_helpers
43

54
#[link(name = "rust_test_helpers", kind = "static")]
65
extern "C" {

src/test/ui/abi/extern/extern-pass-empty.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
// pretty-expanded FIXME #23616
77
// ignore-msvc
88
// ignore-emscripten emcc asserts on an empty struct as an argument
9-
// ignore-uefi no rust_test_helpers
109

1110
#[repr(C)]
1211
struct TwoU8s {

src/test/ui/abi/extern/extern-pass-u32.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// ignore-wasm32-bare no libc for ffi testing
3-
// ignore-uefi no rust_test_helpers
43

54
// Test a function that takes/returns a u32.
65

src/test/ui/abi/extern/extern-pass-u64.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// ignore-wasm32-bare no libc for ffi testing
3-
// ignore-uefi no rust_test_helpers
43

54
// Test a call to a function that takes/returns a u64.
65

src/test/ui/abi/extern/extern-return-TwoU16s.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![allow(improper_ctypes)]
33

44
// ignore-wasm32-bare no libc to test ffi with
5-
// ignore-uefi no rust_test_helpers
65

76
pub struct TwoU16s {
87
one: u16,

src/test/ui/abi/extern/extern-return-TwoU32s.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![allow(improper_ctypes)]
33

44
// ignore-wasm32-bare no libc to test ffi with
5-
// ignore-uefi no rust_test_helpers
65

76
pub struct TwoU32s {
87
one: u32,

src/test/ui/abi/extern/extern-return-TwoU64s.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![allow(improper_ctypes)]
33

44
// ignore-wasm32-bare no libc to test ffi with
5-
// ignore-uefi no rust_test_helpers
65

76
pub struct TwoU64s {
87
one: u64,

src/test/ui/abi/extern/extern-return-TwoU8s.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![allow(improper_ctypes)]
33

44
// ignore-wasm32-bare no libc to test ffi with
5-
// ignore-uefi no rust_test_helpers
65

76
pub struct TwoU8s {
87
one: u8,

src/test/ui/abi/foreign/foreign-call-no-runtime.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// ignore-emscripten no threads support
3-
// ignore-uefi no threads support
43

54
#![feature(rustc_private)]
65

src/test/ui/abi/foreign/foreign-dupe.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// run-pass
22
// aux-build:foreign_lib.rs
33
// ignore-wasm32-bare no libc to test ffi with
4-
// ignore-uefi no libc to test ffi with
54

65
// Check that we can still call duplicated extern (imported) functions
76
// which were declared in another crate. See issues #32740 and #32783.

src/test/ui/abi/foreign/foreign-fn-with-byval.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![allow(improper_ctypes)]
33

44
// ignore-wasm32-bare no libc to test ffi with
5-
// ignore-uefi no rust_test_helpers
65

76
#[derive(Copy, Clone)]
87
pub struct S {

src/test/ui/abi/foreign/foreign-no-abi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// ABI is cdecl by default
33

44
// ignore-wasm32-bare no libc to test ffi with
5-
// ignore-uefi no libc to test ffi with
65
// pretty-expanded FIXME #23616
76

87
#![feature(rustc_private)]

src/test/ui/abi/foreign/invoke-external-foreign.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// run-pass
22
// aux-build:foreign_lib.rs
33
// ignore-wasm32-bare no libc to test ffi with
4-
// ignore-uefi no libc to test ffi with
54

65
// The purpose of this test is to check that we can
76
// successfully (and safely) invoke external, cdecl

src/test/ui/abi/issue-28676.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![allow(improper_ctypes)]
44

55
// ignore-wasm32-bare no libc to test ffi with
6-
// ignore-uefi no rust_test_helpers
76

87
#[derive(Copy, Clone)]
98
pub struct Quad {

src/test/ui/abi/issues/issue-62350-sysv-neg-reg-counts.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![allow(improper_ctypes)]
44

55
// ignore-wasm32-bare no libc to test ffi with
6-
// ignore-uefi no rust_test_helpers
76

87
#[derive(Copy, Clone)]
98
pub struct QuadFloats {

src/test/ui/abi/lib-defaults.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// dont-check-compiler-stderr (rust-lang/rust#54222)
33

44
// ignore-wasm32-bare no libc to test ffi with
5-
// ignore-uefi no rust_test_helpers
65

76
// compile-flags: -lrust_test_helpers
87

src/test/ui/abi/mir/mir_codegen_calls_variadic.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// ignore-wasm32-bare no libc to test ffi with
3-
// ignore-uefi no rust_test_helpers
43

54
#[link(name = "rust_test_helpers", kind = "static")]
65
extern "C" {

src/test/ui/abi/numbers-arithmetic/i128-ffi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
// ignore-windows
99
// ignore-32bit
10-
// ignore-uefi no rust_test_helpers
1110

1211
#[link(name = "rust_test_helpers", kind = "static")]
1312
extern "C" {

src/test/ui/abi/segfault-no-out-of-stack.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// ignore-emscripten can't run commands
55
// ignore-sgx no processes
66
// ignore-fuchsia must translate zircon signal to SIGSEGV/SIGBUS, FIXME (#58590)
7-
// ignore-uefi no libc
87
#![feature(rustc_private)]
98

109
extern crate libc;

src/test/ui/abi/stack-probes-lto.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// ignore-emscripten no processes
1010
// ignore-sgx no processes
1111
// ignore-musl FIXME #31506
12-
// ignore-uefi no rust_test_helpers
1312
// ignore-pretty
1413
// ignore-fuchsia no exception handler registered for segfault
1514
// compile-flags: -C lto

src/test/ui/abi/stack-probes.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// ignore-emscripten no processes
1010
// ignore-sgx no processes
1111
// ignore-fuchsia no exception handler registered for segfault
12-
// ignore-uefi no rust_test_helpers
1312

1413
use std::env;
1514
use std::mem::MaybeUninit;

src/test/ui/abi/statics/static-mut-foreign.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// attempted.
55

66
// ignore-wasm32-bare no libc to test ffi with
7-
// ignore-uefi no libc to test ffi with
87

98
#![feature(rustc_private)]
109

src/test/ui/abi/struct-enums/struct-return.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// run-pass
22
#![allow(dead_code)]
33
// ignore-wasm32-bare no libc to test ffi with
4-
// ignore-uefi no rust_test_helpers
54

65
#[repr(C)]
76
#[derive(Copy, Clone)]

src/test/ui/abi/union/union-c-interop.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![allow(non_snake_case)]
33

44
// ignore-wasm32-bare no libc to test ffi with
5-
// ignore-uefi no rust_test_helpers
65

76
#[derive(Clone, Copy)]
87
#[repr(C)]

src/test/ui/abi/variadic-ffi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// ignore-wasm32-bare no libc to test ffi with
3-
// ignore-uefi no rust_test_helpers
43
#![feature(c_variadic)]
54

65
use std::ffi::VaList;

src/test/ui/array-slice-vec/box-of-array-of-drop-1.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
// destructor.
77

88
// ignore-emscripten no threads support
9-
// ignore-uefi no threads support
109

1110
use std::thread;
1211
use std::sync::atomic::{AtomicUsize, Ordering};

src/test/ui/array-slice-vec/box-of-array-of-drop-2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
// destructor.
77

88
// ignore-emscripten no threads support
9-
// ignore-uefi no threads support
109

1110
use std::thread;
1211
use std::sync::atomic::{AtomicUsize, Ordering};

src/test/ui/array-slice-vec/nested-vec-3.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![allow(overflowing_literals)]
44

55
// ignore-emscripten no threads support
6-
// ignore-uefi no threads support
76

87
// Test that using the `vec!` macro nested within itself works when
98
// the contents implement Drop and we hit a panic in the middle of

src/test/ui/array-slice-vec/slice-panic-1.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// needs-unwind
33

44
// ignore-emscripten no threads support
5-
// ignore-uefi no threads support
65

76
// Test that if a slicing expr[..] fails, the correct cleanups happen.
87

src/test/ui/array-slice-vec/slice-panic-2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// needs-unwind
33

44
// ignore-emscripten no threads support
5-
// ignore-uefi no threads support
65

76
// Test that if a slicing expr[..] fails, the correct cleanups happen.
87

src/test/ui/asm/may_unwind.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// needs-asm-support
3-
// ignore-uefi no unwind
43

54
#![feature(asm_unwind)]
65

0 commit comments

Comments
 (0)