Rollup merge of #71937 - mzohreva:mz/ui-tests-ignore-sgx, r=nikomatsakis

Ignore SGX on a few ui tests cc @jethrogb
2020-05-06 16:59:02 +02:00 · 2020-05-06 16:59:02 +02:00 · 4422cb73b6
commit 4422cb73b6
parent c366b27bfc 7db74beaec
13 changed files with 71 additions and 61 deletions
--- a/src/test/ui/eprint-on-tls-drop.rs
+++ b/src/test/ui/eprint-on-tls-drop.rs
@ -1,5 +1,6 @@
 // run-pass
 // ignore-emscripten no processes
+// ignore-sgx no processes

 use std::cell::RefCell;
 use std::env;
--- a/src/test/ui/issues/issue-15487.rs
+++ b/src/test/ui/issues/issue-15487.rs
@ -2,6 +2,7 @@
 #![allow(unused_attributes)]
 // ignore-windows
 // ignore-wasm32-bare no libs to link
+// ignore-sgx no libs to link

 #![feature(link_args)]

--- a/src/test/ui/issues/issue-17546.rs
+++ b/src/test/ui/issues/issue-17546.rs
@ -1,3 +1,5 @@
+// ignore-sgx std::os::fortanix_sgx::usercalls::raw::Result changes compiler suggestions
+
 use foo::MyEnum::Result;
 use foo::NoResult; // Through a re-export

--- a/src/test/ui/issues/issue-17546.stderr
+++ b/src/test/ui/issues/issue-17546.stderr
@ -1,5 +1,5 @@
 error[E0573]: expected type, found variant `NoResult`
-  --> $DIR/issue-17546.rs:12:17
+  --> $DIR/issue-17546.rs:14:17
   |
 LL |     fn new() -> NoResult<MyEnum, String> {
   |                 ^^^^^^^^^^^^^^^^^^^^^^^^
@ -19,7 +19,7 @@ LL |     fn new() -> Result<MyEnum, String> {
   |                 ^^^^^^

 error[E0573]: expected type, found variant `Result`
-  --> $DIR/issue-17546.rs:22:17
+  --> $DIR/issue-17546.rs:24:17
   |
 LL |     fn new() -> Result<foo::MyEnum, String> {
   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not a type
@ -37,7 +37,7 @@ LL |     use std::result::Result;
     and 1 other candidate

 error[E0573]: expected type, found variant `Result`
-  --> $DIR/issue-17546.rs:28:13
+  --> $DIR/issue-17546.rs:30:13
   |
 LL | fn new() -> Result<foo::MyEnum, String> {
   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not a type
@ -55,7 +55,7 @@ LL | use std::result::Result;
     and 1 other candidate

 error[E0573]: expected type, found variant `NoResult`
-  --> $DIR/issue-17546.rs:33:15
+  --> $DIR/issue-17546.rs:35:15
   |
 LL | fn newer() -> NoResult<foo::MyEnum, String> {
   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
--- a/src/test/ui/lint/use_suggestion_json.rs
+++ b/src/test/ui/lint/use_suggestion_json.rs
@ -1,5 +1,6 @@
 // ignore-cloudabi
 // ignore-windows
+// ignore-sgx std::os::fortanix_sgx::usercalls::alloc::Iter changes compiler suggestions
 // compile-flags: --error-format pretty-json --json=diagnostic-rendered-ansi

 // The output for humans should just highlight the whole span without showing
--- a/src/test/ui/lint/use_suggestion_json.stderr
+++ b/src/test/ui/lint/use_suggestion_json.stderr
@ -72,10 +72,10 @@ mod foo {
  "spans": [
    {
      "file_name": "$DIR/use_suggestion_json.rs",
-      "byte_start": 471,
-      "byte_end": 475,
-      "line_start": 12,
-      "line_end": 12,
+      "byte_start": 560,
+      "byte_end": 564,
+      "line_start": 13,
+      "line_end": 13,
      "column_start": 12,
      "column_end": 16,
      "is_primary": true,
@ -100,10 +100,10 @@ mod foo {
      "spans": [
        {
          "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 448,
-          "byte_end": 448,
-          "line_start": 11,
-          "line_end": 11,
+          "byte_start": 537,
+          "byte_end": 537,
+          "line_start": 12,
+          "line_end": 12,
          "column_start": 1,
          "column_end": 1,
          "is_primary": true,
@ -123,10 +123,10 @@ mod foo {
        },
        {
          "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 448,
-          "byte_end": 448,
-          "line_start": 11,
-          "line_end": 11,
+          "byte_start": 537,
+          "byte_end": 537,
+          "line_start": 12,
+          "line_end": 12,
          "column_start": 1,
          "column_end": 1,
          "is_primary": true,
@ -146,10 +146,10 @@ mod foo {
        },
        {
          "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 448,
-          "byte_end": 448,
-          "line_start": 11,
-          "line_end": 11,
+          "byte_start": 537,
+          "byte_end": 537,
+          "line_start": 12,
+          "line_end": 12,
          "column_start": 1,
          "column_end": 1,
          "is_primary": true,
@ -169,10 +169,10 @@ mod foo {
        },
        {
          "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 448,
-          "byte_end": 448,
-          "line_start": 11,
-          "line_end": 11,
+          "byte_start": 537,
+          "byte_end": 537,
+          "line_start": 12,
+          "line_end": 12,
          "column_start": 1,
          "column_end": 1,
          "is_primary": true,
@ -192,10 +192,10 @@ mod foo {
        },
        {
          "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 448,
-          "byte_end": 448,
-          "line_start": 11,
-          "line_end": 11,
+          "byte_start": 537,
+          "byte_end": 537,
+          "line_start": 12,
+          "line_end": 12,
          "column_start": 1,
          "column_end": 1,
          "is_primary": true,
@ -215,10 +215,10 @@ mod foo {
        },
        {
          "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 448,
-          "byte_end": 448,
-          "line_start": 11,
-          "line_end": 11,
+          "byte_start": 537,
+          "byte_end": 537,
+          "line_start": 12,
+          "line_end": 12,
          "column_start": 1,
          "column_end": 1,
          "is_primary": true,
@ -238,10 +238,10 @@ mod foo {
        },
        {
          "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 448,
-          "byte_end": 448,
-          "line_start": 11,
-          "line_end": 11,
+          "byte_start": 537,
+          "byte_end": 537,
+          "line_start": 12,
+          "line_end": 12,
          "column_start": 1,
          "column_end": 1,
          "is_primary": true,
@ -261,10 +261,10 @@ mod foo {
        },
        {
          "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 448,
-          "byte_end": 448,
-          "line_start": 11,
-          "line_end": 11,
+          "byte_start": 537,
+          "byte_end": 537,
+          "line_start": 12,
+          "line_end": 12,
          "column_start": 1,
          "column_end": 1,
          "is_primary": true,
@ -284,10 +284,10 @@ mod foo {
        },
        {
          "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 448,
-          "byte_end": 448,
-          "line_start": 11,
-          "line_end": 11,
+          "byte_start": 537,
+          "byte_end": 537,
+          "line_start": 12,
+          "line_end": 12,
          "column_start": 1,
          "column_end": 1,
          "is_primary": true,
@ -307,10 +307,10 @@ mod foo {
        },
        {
          "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 448,
-          "byte_end": 448,
-          "line_start": 11,
-          "line_end": 11,
+          "byte_start": 537,
+          "byte_end": 537,
+          "line_start": 12,
+          "line_end": 12,
          "column_start": 1,
          "column_end": 1,
          "is_primary": true,
@ -330,10 +330,10 @@ mod foo {
        },
        {
          "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 448,
-          "byte_end": 448,
-          "line_start": 11,
-          "line_end": 11,
+          "byte_start": 537,
+          "byte_end": 537,
+          "line_start": 12,
+          "line_end": 12,
          "column_start": 1,
          "column_end": 1,
          "is_primary": true,
@ -353,10 +353,10 @@ mod foo {
        },
        {
          "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 448,
-          "byte_end": 448,
-          "line_start": 11,
-          "line_end": 11,
+          "byte_start": 537,
+          "byte_end": 537,
+          "line_start": 12,
+          "line_end": 12,
          "column_start": 1,
          "column_end": 1,
          "is_primary": true,
@ -380,7 +380,7 @@ mod foo {
    }
  ],
  "rendered": "\u001b[0m\u001b[1m\u001b[38;5;9merror[E0412]\u001b[0m\u001b[0m\u001b[1m: cannot find type `Iter` in this scope\u001b[0m
-\u001b[0m  \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0m$DIR/use_suggestion_json.rs:12:12\u001b[0m
+\u001b[0m  \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0m$DIR/use_suggestion_json.rs:13:12\u001b[0m
 \u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m
 \u001b[0m\u001b[1m\u001b[38;5;12mLL\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m    let x: Iter;\u001b[0m
 \u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m           \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;9m^^^^\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;9mnot found in this scope\u001b[0m
--- a/src/test/ui/proc-macro/crt-static.rs
+++ b/src/test/ui/proc-macro/crt-static.rs
@ -3,6 +3,7 @@
 // override -Ctarget-feature=-crt-static from compiletest
 // compile-flags: -Ctarget-feature=
 // ignore-wasm32
+// ignore-sgx no support for proc-macro crate type
 // build-pass
 #![crate_type = "proc-macro"]

--- a/src/test/ui/resolve/issue-16058.rs
+++ b/src/test/ui/resolve/issue-16058.rs
@ -1,3 +1,5 @@
+// ignore-sgx std::os::fortanix_sgx::usercalls::raw::Result changes compiler suggestions
+
 pub struct GslResult {
    pub val: f64,
    pub err: f64
--- a/src/test/ui/resolve/issue-16058.stderr
+++ b/src/test/ui/resolve/issue-16058.stderr
@ -1,5 +1,5 @@
 error[E0574]: expected struct, variant or union type, found enum `Result`
-  --> $DIR/issue-16058.rs:8:9
+  --> $DIR/issue-16058.rs:10:9
   |
 LL |         Result {
   |         ^^^^^^ not a struct, variant or union type
--- a/src/test/ui/test-panic-abort-nocapture.rs
+++ b/src/test/ui/test-panic-abort-nocapture.rs
@ -7,6 +7,7 @@

 // ignore-wasm no panic or subprocess support
 // ignore-emscripten no panic or subprocess support
+// ignore-sgx no subprocess support

 #![cfg(test)]

--- a/src/test/ui/test-panic-abort-nocapture.run.stderr
+++ b/src/test/ui/test-panic-abort-nocapture.run.stderr
@ -1,9 +1,9 @@
 thread 'main' panicked at 'assertion failed: `(left == right)`
  left: `2`,
- right: `4`', $DIR/test-panic-abort-nocapture.rs:31:5
+ right: `4`', $DIR/test-panic-abort-nocapture.rs:32:5
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 thread 'main' panicked at 'assertion failed: `(left == right)`
  left: `2`,
- right: `4`', $DIR/test-panic-abort-nocapture.rs:25:5
+ right: `4`', $DIR/test-panic-abort-nocapture.rs:26:5
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 testing321
--- a/src/test/ui/test-panic-abort.rs
+++ b/src/test/ui/test-panic-abort.rs
@ -7,6 +7,7 @@

 // ignore-wasm no panic or subprocess support
 // ignore-emscripten no panic or subprocess support
+// ignore-sgx no subprocess support

 #![cfg(test)]

--- a/src/test/ui/test-panic-abort.run.stdout
+++ b/src/test/ui/test-panic-abort.run.stdout
@ -18,7 +18,7 @@ testing123
 testing321
 thread 'main' panicked at 'assertion failed: `(left == right)`
  left: `2`,
- right: `5`', $DIR/test-panic-abort.rs:32:5
+ right: `5`', $DIR/test-panic-abort.rs:33:5
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace