1
Fork 0

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.
This commit is contained in:
bors 2019-05-18 09:04:14 +00:00
commit b8aa422a78
79 changed files with 113 additions and 20 deletions

View file

@ -12,6 +12,7 @@
// ignore-netbsd
// ignore-openbsd
// ignore-solaris
// ignore-sgx no dynamic linking
// aux-build:dummy.rs
// aux-build:wrapper.rs

View file

@ -11,6 +11,7 @@
// ignore-netbsd
// ignore-openbsd
// ignore-solaris
// ignore-sgx
// compile-flags: -C no-prepopulate-passes -C panic=abort -O

View file

@ -1,5 +1,6 @@
// Test what happens we save incremental compilation state that makes
// use of foreign items. This used to ICE (#34991).
// ignore-sgx no libc
// revisions: rpass1

View file

@ -1,6 +1,7 @@
// no-prefer-dynamic
// ignore-cloudabi
// ignore-emscripten
// ignore-sgx no processes
// ignore-macos this needs valgrind 3.11 or higher; see
// https://github.com/rust-lang/rust/pull/30365#issuecomment-165763679

View file

@ -4,6 +4,7 @@
// ignore-cloudabi no env and process
// ignore-emscripten no processes
// ignore-sgx no processes
use std::{env, panic};
use std::io::prelude::*;

View file

@ -2,6 +2,7 @@
#![allow(deprecated)]
// ignore-cloudabi no process support
// ignore-emscripten no threads support
// ignore-sgx no processes
use std::{env, fmt, process, sync, thread};

View file

@ -11,6 +11,7 @@
// ignore-cloudabi spawning processes is not supported
// ignore-emscripten spawning processes is not supported
// normalize-stderr-test ".*\n" -> ""
// ignore-sgx no processes
// Note that above `-opt-bisect-limit=0` is used to basically disable
// optimizations. It creates tons of output on stderr, hence we normalize

View file

@ -2,6 +2,7 @@
// ignore-cloudabi spawning processes is not supported
// ignore-emscripten spawning processes is not supported
// ignore-openbsd no support for libbacktrace without filename
// ignore-sgx no processes
// compile-flags:-g
use std::env;

View file

@ -1,4 +1,5 @@
// ignore-wasm32-bare no libc to test with
// ignore-sgx no libc
#![feature(rustc_private)]

View file

@ -2,6 +2,7 @@
// pretty-expanded FIXME #23616
// ignore-cloudabi no target_family
// ignore-wasm32-bare no target_family
// ignore-sgx
#[cfg(windows)]
pub fn main() {

View file

@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no target_family
// ignore-wasm32-bare no target_family
// ignore-sgx
// pretty-expanded FIXME #23616

View file

@ -3,6 +3,7 @@
// ignore-pretty issue #37199
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
#![feature(process_exec)]

View file

@ -2,6 +2,7 @@
// ignore-windows - this is a unix-specific test
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
#![feature(process_exec, rustc_private)]
extern crate libc;

View file

@ -5,6 +5,7 @@
// compile-flags:--test
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
// N.B., these tests kill child processes. Valgrind sees these children as leaking
// memory, which makes for some *confusing* logs. That's why these are here

View file

@ -1,5 +1,6 @@
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::alloc::{Layout, handle_alloc_error};
use std::env;

View file

@ -1,5 +1,6 @@
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::env::args;
use std::process::Command;

View file

@ -4,6 +4,7 @@
// ignore-windows
// ignore-cloudabi no execve
// ignore-emscripten no execve
// ignore-sgx no execve
// no-prefer-dynamic
#![feature(rustc_private)]

View file

@ -2,6 +2,7 @@
#![allow(deprecated)]
// ignore-cloudabi no environment variables present
// ignore-emscripten env vars don't work?
// ignore-sgx env vars cannot be modified
use std::env::*;
use std::path::PathBuf;

View file

@ -1,6 +1,7 @@
// exec-env:TEST_EXEC_ENV=22
// ignore-cloudabi no env vars
// ignore-emscripten FIXME: issue #31622
// ignore-sgx unsupported
use std::env;

View file

@ -3,6 +3,7 @@
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-haiku
// ignore-sgx no processes
#![feature(rustc_private)]

View file

@ -1,5 +1,6 @@
// run-pass
// ignore-wasm32-bare no libc to test ffi with
// ignore-sgx no libc
#![feature(rustc_private)]

View file

@ -1,5 +1,6 @@
// ignore-emscripten
// ignore-wasm32
// ignore-sgx no processes
use std::env;
use std::process::Command;

View file

@ -40,6 +40,18 @@ mod m {
}
}
#[cfg(target_env = "sgx")]
mod m {
#[main]
#[cfg(target_arch = "x86_64")]
pub fn main() {
unsafe {
assert_eq!(::rusti::pref_align_of::<u64>(), 8);
assert_eq!(::rusti::min_align_of::<u64>(), 8);
}
}
}
#[cfg(target_os = "windows")]
mod m {
#[main]

View file

@ -1,6 +1,7 @@
#![allow(unused_mut)]
// ignore-wasm32
// ignore-emscripten
// ignore-sgx no processes
// compile-flags: -C debug_assertions=yes

View file

@ -1,6 +1,7 @@
// edition:2018
// run-pass
// ignore-emscripten no threads support
// ignore-sgx no thread sleep support
use std::thread;
use std::time::Duration;

View file

@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
// Make sure that if a process doesn't have its stdio/stderr descriptors set up
// that we don't die in a large ball of fire

View file

@ -5,6 +5,7 @@
// ignore-cloudabi no dylib support
// ignore-emscripten no dylib support
// ignore-musl
// ignore-sgx no dylib support
// pretty-expanded FIXME #23616

View file

@ -1,5 +1,6 @@
// run-pass
// ignore-wasm32-bare can't block the thread
// ignore-sgx not supported
#![allow(deprecated)]
use std::thread;

View file

@ -2,6 +2,7 @@
#![allow(unused_mut)]
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::env;
use std::io::prelude::*;

View file

@ -2,6 +2,7 @@
#![allow(unused_mut)]
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::env;
use std::io::prelude::*;

View file

@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::env;
use std::process::Command;

View file

@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::process::Command;
use std::env;

View file

@ -1,6 +1,6 @@
// run-pass
// ignore-wasm32-bare no libc to test ffi with
// ignore-sgx no libc
#![feature(rustc_private)]
extern crate libc;

View file

@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no processes
// ignore-emscripten no threads
// ignore-sgx no processes
use std::thread;
use std::env;

View file

@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
// Previously libstd would set stdio descriptors of a child process
// by `dup`ing the requested descriptors to inherit directly into the

View file

@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::process::{Command, Stdio};
use std::env;

View file

@ -2,6 +2,7 @@
#![allow(unused_must_use)]
#![allow(deprecated)]
// ignore-emscripten no threads support
// ignore-sgx no thread sleep support
use std::sync::mpsc::{TryRecvError, channel};
use std::thread;

View file

@ -1,6 +1,7 @@
// ignore-windows
// ignore-macos
// ignore-emscripten doesn't support this linkage
// ignore-sgx weak linkage not permitted
// aux-build:linkage1.rs
#![feature(linkage)]

View file

@ -1,5 +1,6 @@
// compile-flags:--test
// ignore-emscripten
// ignore-sgx no thread sleep support
use std::sync::mpsc::channel;
use std::sync::mpsc::TryRecvError;

View file

@ -1,5 +1,6 @@
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
fn check_for_no_backtrace(test: std::process::Output) {
assert!(!test.status.success());

View file

@ -1,6 +1,7 @@
// ignore-android
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
#![feature(rustc_private)]

View file

@ -4,6 +4,7 @@
// ignore-musl
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
#![feature(asm)]
#![feature(rustc_private)]

View file

@ -5,6 +5,7 @@
// no-prefer-dynamic
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
// ignore-macos
extern crate exit_success_if_unwind;

View file

@ -4,6 +4,7 @@
// no-prefer-dynamic
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
// ignore-macos
use std::process::Command;

View file

@ -4,6 +4,7 @@
// no-prefer-dynamic
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::process::Command;
use std::env;

View file

@ -5,6 +5,7 @@
// no-prefer-dynamic
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::process::Command;
use std::env;

View file

@ -2,6 +2,7 @@
// ignore-cloudabi no files or I/O
// ignore-wasm32-bare no files or I/O
// ignore-emscripten no files
// ignore-sgx no files
use std::fs;
use std::io;

View file

@ -1,5 +1,6 @@
// ignore-cloudabi spawning processes is not supported
// ignore-emscripten spawning processes is not supported
// ignore-sgx no processes
use std::{env, process};

View file

@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::process::Command;
use std::env;

View file

@ -2,6 +2,7 @@
#![allow(unused_imports)]
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::env;
use std::process::{self, Command, Stdio};

View file

@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::process::Command;
use std::env;

View file

@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::io::ErrorKind;
use std::process::Command;

View file

@ -9,6 +9,7 @@
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::io::prelude::*;
use std::io;

View file

@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::env;
use std::io;

View file

@ -2,6 +2,7 @@
#![allow(dead_code)]
// ignore-cloudabi stdout does not map to file descriptor 1 by default
// ignore-wasm32-bare no libc
// ignore-sgx no libc
#![feature(rustc_private)]

View file

@ -1,5 +1,6 @@
// ignore-cloudabi spawning processes is not supported
// ignore-emscripten spawning processes is not supported
// ignore-sgx no processes
#![feature(start)]

View file

@ -1,6 +1,7 @@
#![allow(unused_imports)]
// ignore-cloudabi can't run commands
// ignore-emscripten can't run commands
// ignore-sgx no processes
#![feature(rustc_private)]

View file

@ -5,6 +5,7 @@
// ignore-cloudabi no signal handling support
// ignore-wasm32-bare no libc
// ignore-windows
// ignore-sgx no libc
#![feature(rustc_private)]
extern crate libc;

View file

@ -1,5 +1,6 @@
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
// ignore-windows
use std::env;

View file

@ -4,6 +4,7 @@
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::env;
use std::io::prelude::*;

View file

@ -4,6 +4,7 @@
#![allow(overflowing_literals)]
// ignore-emscripten
// ignore-sgx no processes
#![feature(repr_simd, target_feature, cfg_target_feature)]
#![feature(avx512_target_feature)]

View file

@ -1,4 +1,5 @@
// ignore-emscripten no threads support
// ignore-sgx no thread sleep support
use std::thread::{self, sleep};
use std::time::Duration;

View file

@ -9,6 +9,7 @@
// ignore-wasm
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
// ignore-musl FIXME #31506
// ignore-pretty
// compile-flags: -C lto

View file

@ -9,6 +9,7 @@
// ignore-wasm
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
// ignore-musl FIXME #31506
use std::mem;

View file

@ -1,5 +1,6 @@
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
use std::env;
use std::io::prelude::*;

View file

@ -55,6 +55,15 @@ mod m {
}
}
#[cfg(target_env = "sgx")]
mod m {
#[cfg(target_arch = "x86_64")]
pub mod m {
pub fn align() -> usize { 8 }
pub fn size() -> usize { 16 }
}
}
#[cfg(target_os = "windows")]
mod m {
#[cfg(target_arch = "x86")]

View file

@ -3,6 +3,7 @@
// ignore-emscripten no threads or sockets support
// ignore-netbsd system ulimit (Too many open files)
// ignore-openbsd system ulimit (Too many open files)
// ignore-sgx no thread sleep support
use std::io::prelude::*;
use std::net::{TcpListener, TcpStream};

View file

@ -2,6 +2,7 @@
// ignore-cloudabi networking not available
// ignore-wasm32-bare networking not available
// ignore-sgx ToSocketAddrs cannot be used for DNS Resolution
use std::net::ToSocketAddrs;

View file

@ -1,6 +1,7 @@
#![allow(stable_features)]
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
#![feature(process_try_wait)]

View file

@ -1,5 +1,6 @@
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
#![feature(rustc_private)]

View file

@ -1,5 +1,5 @@
// ignore-wasm32-bare no libc to test ffi with
// ignore-sgx no libc
// GetLastError doesn't seem to work with stack switching
#[cfg(windows)]

View file

@ -3,7 +3,7 @@
// ignore-musl
// ignore-cloudabi
// ignore-emscripten
// ignore-sgx no dynamic libraries
#![crate_type = "cdylib"]
extern crate cdylib_dep;

View file

@ -3,6 +3,7 @@
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
#![feature(os)]

View file

@ -6,6 +6,7 @@
// ignore-windows
// ignore-cloudabi
// ignore-emscripten
// ignore-sgx no processes
use std::process::Command;
// use std::os::unix::process::CommandExt;

View file

@ -1,5 +1,5 @@
error[E0599]: no method named `exec` found for type `&mut std::process::Command` in the current scope
--> $DIR/issue-39175.rs:14:39
--> $DIR/issue-39175.rs:15:39
|
LL | Command::new("echo").arg("hello").exec();
| ^^^^

View file

@ -1,6 +1,7 @@
// FIXME https://github.com/rust-lang/rust/issues/59774
// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
// ignore-sgx no weak linkages permitted
#![feature(linkage)]

View file

@ -1,5 +1,5 @@
error: must have type `*const T` or `*mut T`
--> $DIR/linkage2.rs:8:32
--> $DIR/linkage2.rs:9:32
|
LL | #[linkage = "extern_weak"] static foo: i32;
| ^^^^^^^^^^^^^^^^

View file

@ -2,6 +2,7 @@
// ignore-musl - no dylibs here
// ignore-cloudabi
// ignore-emscripten
// ignore-sgx no dynamic lib support
// error-pattern:`panic_unwind` is not compiled with this crate's panic strategy
// This is a test where the local crate, compiled with `panic=abort`, links to

View file

@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes
// Tests ensuring that `dbg!(expr)` has the expected run-time behavior.
// as well as some compile time properties we expect.
@ -69,44 +70,44 @@ fn test() {
fn validate_stderr(stderr: Vec<String>) {
assert_eq!(stderr, &[
":21] Unit = Unit",
":22] Unit = Unit",
":22] a = Unit",
":23] a = Unit",
":28] Point{x: 42, y: 24,} = Point {",
":29] Point{x: 42, y: 24,} = Point {",
" x: 42,",
" y: 24,",
"}",
":29] b = Point {",
":30] b = Point {",
" x: 42,",
" y: 24,",
"}",
":37]",
":38]",
":41] &a = NoCopy(",
":42] &a = NoCopy(",
" 1337,",
")",
":41] dbg!(& a) = NoCopy(",
":42] dbg!(& a) = NoCopy(",
" 1337,",
")",
":46] f(&42) = 42",
":47] f(&42) = 42",
"before",
":51] { foo += 1; eprintln!(\"before\"); 7331 } = 7331",
":52] { foo += 1; eprintln!(\"before\"); 7331 } = 7331",
":59] (\"Yeah\",) = (",
":60] (\"Yeah\",) = (",
" \"Yeah\",",
")",
":62] 1 = 1",
":62] 2 = 2",
":63] 1 = 1",
":63] 2 = 2",
":66] 1u8 = 1",
":66] 2u32 = 2",
":66] \"Yeah\" = \"Yeah\"",
":67] 1u8 = 1",
":67] 2u32 = 2",
":67] \"Yeah\" = \"Yeah\"",
]);
}