Skip to content

Commit

Permalink
Auto merge of #60386 - Goirad:sgx-ignore-tests, r=nikomatsakis
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed May 18, 2019
2 parents 548add7 + 4e7ac47 commit b8aa422
Show file tree
Hide file tree
Showing 79 changed files with 113 additions and 20 deletions.
1 change: 1 addition & 0 deletions src/test/codegen/dllimports/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// ignore-netbsd
// ignore-openbsd
// ignore-solaris
// ignore-sgx no dynamic linking

// aux-build:dummy.rs
// aux-build:wrapper.rs
Expand Down
1 change: 1 addition & 0 deletions src/test/codegen/panic-abort-windows.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// ignore-netbsd
// ignore-openbsd
// ignore-solaris
// ignore-sgx

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

Expand Down
1 change: 1 addition & 0 deletions src/test/incremental/foreign.rs
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass-valgrind/exit-flushes.rs
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/abort-on-c-abi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/atomic-print.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/backtrace-debuginfo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/backtrace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/c-stack-returning-int64.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// ignore-wasm32-bare no libc to test with
// ignore-sgx no libc

#![feature(rustc_private)]

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/cfg/cfg-family.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/cfg/cfg-target-family.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no target_family
// ignore-wasm32-bare no target_family
// ignore-sgx

// pretty-expanded FIXME #23616

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/command-exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// ignore-pretty issue #37199
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes

#![feature(process_exec)]

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/command-pre-exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/core-run-destroy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/default-alloc-error-hook.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/env-args-reverse-iterator.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes

use std::env::args;
use std::process::Command;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/env-funky-keys.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// ignore-windows
// ignore-cloudabi no execve
// ignore-emscripten no execve
// ignore-sgx no execve
// no-prefer-dynamic

#![feature(rustc_private)]
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/env-home-dir.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/exec-env.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/fds-are-cloexec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-haiku
// ignore-sgx no processes

#![feature(rustc_private)]

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/foreign/foreign-fn-linkname.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// run-pass
// ignore-wasm32-bare no libc to test ffi with
// ignore-sgx no libc

#![feature(rustc_private)]

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/inherit-env.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// ignore-emscripten
// ignore-wasm32
// ignore-sgx no processes

use std::env;
use std::process::Command;
Expand Down
12 changes: 12 additions & 0 deletions src/test/run-pass/intrinsics/intrinsic-alignment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/invalid_const_promotion.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#![allow(unused_mut)]
// ignore-wasm32
// ignore-emscripten
// ignore-sgx no processes

// compile-flags: -C debug_assertions=yes

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/issue-59020.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/issues/issue-10626.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/issues/issue-12133-3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/issues/issue-12699.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// run-pass
// ignore-wasm32-bare can't block the thread
// ignore-sgx not supported
#![allow(deprecated)]

use std::thread;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/issues/issue-13304.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/issues/issue-14456.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/issues/issue-14940.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/issues/issue-16272.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/issues/issue-2214.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/issues/issue-24313.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// run-pass
// ignore-cloudabi no processes
// ignore-emscripten no threads
// ignore-sgx no processes

use std::thread;
use std::env;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/issues/issue-30490.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/issues/issue-33770.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/issues/issue-9396.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/linkage1.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/mpsc_stress.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/multi-panic.rs
Original file line number Diff line number Diff line change
@@ -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());
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/no-stdio.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// ignore-android
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes

#![feature(rustc_private)]

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/out-of-stack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// ignore-musl
// ignore-cloudabi no processes
// ignore-emscripten no processes
// ignore-sgx no processes

#![feature(asm)]
#![feature(rustc_private)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/panic-runtime/abort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/panic-runtime/lto-abort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/panic-runtime/lto-unwind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/paths-containing-nul.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/print-stdout-eprint-stderr.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/process/process-envs.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/process/process-exit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
Loading

0 comments on commit b8aa422

Please sign in to comment.