about summary refs log tree commit diff
path: root/src/test/codegen
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-05-18 09:04:14 +0000
committerbors <bors@rust-lang.org>2019-05-18 09:04:14 +0000
commitb8aa422a788c45c67d747346276d229d08925fe1 (patch)
treeaff31711f30b7f9e3ebf1c47d0ba7e7a823831cd /src/test/codegen
parent548add7f61bfcbe3bea3f5ccefb53c84da8fefe4 (diff)
parent4e7ac47345335326d5ff7fa5f4d3b5b8e2d2131a (diff)
downloadrust-b8aa422a788c45c67d747346276d229d08925fe1.tar.gz
rust-b8aa422a788c45c67d747346276d229d08925fe1.zip
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.
Diffstat (limited to 'src/test/codegen')
-rw-r--r--src/test/codegen/dllimports/main.rs1
-rw-r--r--src/test/codegen/panic-abort-windows.rs1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/test/codegen/dllimports/main.rs b/src/test/codegen/dllimports/main.rs
index 52543297ead..73631b92c1f 100644
--- a/src/test/codegen/dllimports/main.rs
+++ b/src/test/codegen/dllimports/main.rs
@@ -12,6 +12,7 @@
 // ignore-netbsd
 // ignore-openbsd
 // ignore-solaris
+// ignore-sgx no dynamic linking
 
 // aux-build:dummy.rs
 // aux-build:wrapper.rs
diff --git a/src/test/codegen/panic-abort-windows.rs b/src/test/codegen/panic-abort-windows.rs
index f2fd297dc70..8e38245267d 100644
--- a/src/test/codegen/panic-abort-windows.rs
+++ b/src/test/codegen/panic-abort-windows.rs
@@ -11,6 +11,7 @@
 // ignore-netbsd
 // ignore-openbsd
 // ignore-solaris
+// ignore-sgx
 
 // compile-flags: -C no-prepopulate-passes -C panic=abort -O