Skip to content

Commit b8aa422

Browse files
committed
Auto merge of #60386 - Goirad:sgx-ignore-tests, r=nikomatsakis
Added ignore-sgx for appropriate tests in src/test These are all the tests that make sense to ignore when targeting fortanix-unknonw-sgx, at least in test/runpass. Other suites not yet covered.
2 parents 548add7 + 4e7ac47 commit b8aa422

File tree

79 files changed

+113
-20
lines changed

Some content is hidden

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

79 files changed

+113
-20
lines changed

Diff for: src/test/codegen/dllimports/main.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// ignore-netbsd
1313
// ignore-openbsd
1414
// ignore-solaris
15+
// ignore-sgx no dynamic linking
1516

1617
// aux-build:dummy.rs
1718
// aux-build:wrapper.rs

Diff for: src/test/codegen/panic-abort-windows.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// ignore-netbsd
1212
// ignore-openbsd
1313
// ignore-solaris
14+
// ignore-sgx
1415

1516
// compile-flags: -C no-prepopulate-passes -C panic=abort -O
1617

Diff for: src/test/incremental/foreign.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Test what happens we save incremental compilation state that makes
22
// use of foreign items. This used to ICE (#34991).
3+
// ignore-sgx no libc
34

45
// revisions: rpass1
56

Diff for: src/test/run-pass-valgrind/exit-flushes.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// no-prefer-dynamic
22
// ignore-cloudabi
33
// ignore-emscripten
4+
// ignore-sgx no processes
45
// ignore-macos this needs valgrind 3.11 or higher; see
56
// https://github.com/rust-lang/rust/pull/30365#issuecomment-165763679
67

Diff for: src/test/run-pass/abort-on-c-abi.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
// ignore-cloudabi no env and process
66
// ignore-emscripten no processes
7+
// ignore-sgx no processes
78

89
use std::{env, panic};
910
use std::io::prelude::*;

Diff for: src/test/run-pass/atomic-print.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#![allow(deprecated)]
33
// ignore-cloudabi no process support
44
// ignore-emscripten no threads support
5+
// ignore-sgx no processes
56

67
use std::{env, fmt, process, sync, thread};
78

Diff for: src/test/run-pass/backtrace-debuginfo.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// ignore-cloudabi spawning processes is not supported
1212
// ignore-emscripten spawning processes is not supported
1313
// normalize-stderr-test ".*\n" -> ""
14+
// ignore-sgx no processes
1415

1516
// Note that above `-opt-bisect-limit=0` is used to basically disable
1617
// optimizations. It creates tons of output on stderr, hence we normalize

Diff for: src/test/run-pass/backtrace.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// ignore-cloudabi spawning processes is not supported
33
// ignore-emscripten spawning processes is not supported
44
// ignore-openbsd no support for libbacktrace without filename
5+
// ignore-sgx no processes
56
// compile-flags:-g
67

78
use std::env;

Diff for: src/test/run-pass/c-stack-returning-int64.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// ignore-wasm32-bare no libc to test with
2+
// ignore-sgx no libc
23

34
#![feature(rustc_private)]
45

Diff for: src/test/run-pass/cfg/cfg-family.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// pretty-expanded FIXME #23616
33
// ignore-cloudabi no target_family
44
// ignore-wasm32-bare no target_family
5+
// ignore-sgx
56

67
#[cfg(windows)]
78
pub fn main() {

Diff for: src/test/run-pass/cfg/cfg-target-family.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// run-pass
22
// ignore-cloudabi no target_family
33
// ignore-wasm32-bare no target_family
4+
// ignore-sgx
45

56
// pretty-expanded FIXME #23616
67

Diff for: src/test/run-pass/command-exec.rs

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// ignore-pretty issue #37199
44
// ignore-cloudabi no processes
55
// ignore-emscripten no processes
6+
// ignore-sgx no processes
67

78
#![feature(process_exec)]
89

Diff for: src/test/run-pass/command-pre-exec.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// ignore-windows - this is a unix-specific test
33
// ignore-cloudabi no processes
44
// ignore-emscripten no processes
5+
// ignore-sgx no processes
56
#![feature(process_exec, rustc_private)]
67

78
extern crate libc;

Diff for: src/test/run-pass/core-run-destroy.rs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// compile-flags:--test
66
// ignore-cloudabi no processes
77
// ignore-emscripten no processes
8+
// ignore-sgx no processes
89

910
// N.B., these tests kill child processes. Valgrind sees these children as leaking
1011
// memory, which makes for some *confusing* logs. That's why these are here

Diff for: src/test/run-pass/default-alloc-error-hook.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// ignore-cloudabi no processes
22
// ignore-emscripten no processes
3+
// ignore-sgx no processes
34

45
use std::alloc::{Layout, handle_alloc_error};
56
use std::env;

Diff for: src/test/run-pass/env-args-reverse-iterator.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// ignore-cloudabi no processes
22
// ignore-emscripten no processes
3+
// ignore-sgx no processes
34

45
use std::env::args;
56
use std::process::Command;

Diff for: src/test/run-pass/env-funky-keys.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// ignore-windows
55
// ignore-cloudabi no execve
66
// ignore-emscripten no execve
7+
// ignore-sgx no execve
78
// no-prefer-dynamic
89

910
#![feature(rustc_private)]

Diff for: src/test/run-pass/env-home-dir.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#![allow(deprecated)]
33
// ignore-cloudabi no environment variables present
44
// ignore-emscripten env vars don't work?
5+
// ignore-sgx env vars cannot be modified
56

67
use std::env::*;
78
use std::path::PathBuf;

Diff for: src/test/run-pass/exec-env.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// exec-env:TEST_EXEC_ENV=22
22
// ignore-cloudabi no env vars
33
// ignore-emscripten FIXME: issue #31622
4+
// ignore-sgx unsupported
45

56
use std::env;
67

Diff for: src/test/run-pass/fds-are-cloexec.rs

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// ignore-cloudabi no processes
44
// ignore-emscripten no processes
55
// ignore-haiku
6+
// ignore-sgx no processes
67

78
#![feature(rustc_private)]
89

Diff for: src/test/run-pass/foreign/foreign-fn-linkname.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// run-pass
22
// ignore-wasm32-bare no libc to test ffi with
3+
// ignore-sgx no libc
34

45
#![feature(rustc_private)]
56

Diff for: src/test/run-pass/inherit-env.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// ignore-emscripten
22
// ignore-wasm32
3+
// ignore-sgx no processes
34

45
use std::env;
56
use std::process::Command;

Diff for: src/test/run-pass/intrinsics/intrinsic-alignment.rs

+12
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@ mod m {
4040
}
4141
}
4242

43+
#[cfg(target_env = "sgx")]
44+
mod m {
45+
#[main]
46+
#[cfg(target_arch = "x86_64")]
47+
pub fn main() {
48+
unsafe {
49+
assert_eq!(::rusti::pref_align_of::<u64>(), 8);
50+
assert_eq!(::rusti::min_align_of::<u64>(), 8);
51+
}
52+
}
53+
}
54+
4355
#[cfg(target_os = "windows")]
4456
mod m {
4557
#[main]

Diff for: src/test/run-pass/invalid_const_promotion.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#![allow(unused_mut)]
22
// ignore-wasm32
33
// ignore-emscripten
4+
// ignore-sgx no processes
45

56
// compile-flags: -C debug_assertions=yes
67

Diff for: src/test/run-pass/issue-59020.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// edition:2018
22
// run-pass
33
// ignore-emscripten no threads support
4+
// ignore-sgx no thread sleep support
45

56
use std::thread;
67
use std::time::Duration;

Diff for: src/test/run-pass/issues/issue-10626.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// run-pass
22
// ignore-cloudabi no processes
33
// ignore-emscripten no processes
4+
// ignore-sgx no processes
45

56
// Make sure that if a process doesn't have its stdio/stderr descriptors set up
67
// that we don't die in a large ball of fire

Diff for: src/test/run-pass/issues/issue-12133-3.rs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// ignore-cloudabi no dylib support
66
// ignore-emscripten no dylib support
77
// ignore-musl
8+
// ignore-sgx no dylib support
89

910
// pretty-expanded FIXME #23616
1011

Diff for: src/test/run-pass/issues/issue-12699.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// run-pass
22
// ignore-wasm32-bare can't block the thread
3+
// ignore-sgx not supported
34
#![allow(deprecated)]
45

56
use std::thread;

Diff for: src/test/run-pass/issues/issue-13304.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#![allow(unused_mut)]
33
// ignore-cloudabi no processes
44
// ignore-emscripten no processes
5+
// ignore-sgx no processes
56

67
use std::env;
78
use std::io::prelude::*;

Diff for: src/test/run-pass/issues/issue-14456.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#![allow(unused_mut)]
33
// ignore-cloudabi no processes
44
// ignore-emscripten no processes
5+
// ignore-sgx no processes
56

67
use std::env;
78
use std::io::prelude::*;

Diff for: src/test/run-pass/issues/issue-14940.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// run-pass
22
// ignore-cloudabi no processes
33
// ignore-emscripten no processes
4+
// ignore-sgx no processes
45

56
use std::env;
67
use std::process::Command;

Diff for: src/test/run-pass/issues/issue-16272.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// run-pass
22
// ignore-cloudabi no processes
33
// ignore-emscripten no processes
4+
// ignore-sgx no processes
45

56
use std::process::Command;
67
use std::env;

Diff for: src/test/run-pass/issues/issue-2214.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// run-pass
22
// ignore-wasm32-bare no libc to test ffi with
3-
3+
// ignore-sgx no libc
44
#![feature(rustc_private)]
55

66
extern crate libc;

Diff for: src/test/run-pass/issues/issue-24313.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// run-pass
22
// ignore-cloudabi no processes
33
// ignore-emscripten no threads
4+
// ignore-sgx no processes
45

56
use std::thread;
67
use std::env;

Diff for: src/test/run-pass/issues/issue-30490.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// run-pass
22
// ignore-cloudabi no processes
33
// ignore-emscripten no processes
4+
// ignore-sgx no processes
45

56
// Previously libstd would set stdio descriptors of a child process
67
// by `dup`ing the requested descriptors to inherit directly into the

Diff for: src/test/run-pass/issues/issue-33770.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// run-pass
22
// ignore-cloudabi no processes
33
// ignore-emscripten no processes
4+
// ignore-sgx no processes
45

56
use std::process::{Command, Stdio};
67
use std::env;

Diff for: src/test/run-pass/issues/issue-9396.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#![allow(unused_must_use)]
33
#![allow(deprecated)]
44
// ignore-emscripten no threads support
5+
// ignore-sgx no thread sleep support
56

67
use std::sync::mpsc::{TryRecvError, channel};
78
use std::thread;

Diff for: src/test/run-pass/linkage1.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// ignore-windows
22
// ignore-macos
33
// ignore-emscripten doesn't support this linkage
4+
// ignore-sgx weak linkage not permitted
45
// aux-build:linkage1.rs
56

67
#![feature(linkage)]

Diff for: src/test/run-pass/mpsc_stress.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// compile-flags:--test
22
// ignore-emscripten
3+
// ignore-sgx no thread sleep support
34

45
use std::sync::mpsc::channel;
56
use std::sync::mpsc::TryRecvError;

Diff for: src/test/run-pass/multi-panic.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// ignore-cloudabi no processes
22
// ignore-emscripten no processes
3+
// ignore-sgx no processes
34

45
fn check_for_no_backtrace(test: std::process::Output) {
56
assert!(!test.status.success());

Diff for: src/test/run-pass/no-stdio.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// ignore-android
22
// ignore-cloudabi no processes
33
// ignore-emscripten no processes
4+
// ignore-sgx no processes
45

56
#![feature(rustc_private)]
67

Diff for: src/test/run-pass/out-of-stack.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// ignore-musl
55
// ignore-cloudabi no processes
66
// ignore-emscripten no processes
7+
// ignore-sgx no processes
78

89
#![feature(asm)]
910
#![feature(rustc_private)]

Diff for: src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// no-prefer-dynamic
66
// ignore-cloudabi no processes
77
// ignore-emscripten no processes
8+
// ignore-sgx no processes
89
// ignore-macos
910

1011
extern crate exit_success_if_unwind;

Diff for: src/test/run-pass/panic-runtime/abort.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// no-prefer-dynamic
55
// ignore-cloudabi no processes
66
// ignore-emscripten no processes
7+
// ignore-sgx no processes
78
// ignore-macos
89

910
use std::process::Command;

Diff for: src/test/run-pass/panic-runtime/lto-abort.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// no-prefer-dynamic
55
// ignore-cloudabi no processes
66
// ignore-emscripten no processes
7+
// ignore-sgx no processes
78

89
use std::process::Command;
910
use std::env;

Diff for: src/test/run-pass/panic-runtime/lto-unwind.rs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// no-prefer-dynamic
66
// ignore-cloudabi no processes
77
// ignore-emscripten no processes
8+
// ignore-sgx no processes
89

910
use std::process::Command;
1011
use std::env;

Diff for: src/test/run-pass/paths-containing-nul.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// ignore-cloudabi no files or I/O
33
// ignore-wasm32-bare no files or I/O
44
// ignore-emscripten no files
5+
// ignore-sgx no files
56

67
use std::fs;
78
use std::io;

Diff for: src/test/run-pass/print-stdout-eprint-stderr.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// ignore-cloudabi spawning processes is not supported
22
// ignore-emscripten spawning processes is not supported
3+
// ignore-sgx no processes
34

45
use std::{env, process};
56

Diff for: src/test/run-pass/process/process-envs.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// run-pass
22
// ignore-cloudabi no processes
33
// ignore-emscripten no processes
4+
// ignore-sgx no processes
45

56
use std::process::Command;
67
use std::env;

Diff for: src/test/run-pass/process/process-exit.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#![allow(unused_imports)]
33
// ignore-cloudabi no processes
44
// ignore-emscripten no processes
5+
// ignore-sgx no processes
56

67
use std::env;
78
use std::process::{self, Command, Stdio};

0 commit comments

Comments
 (0)