Skip to content

Commit

Permalink
Ignore SGX on a few ui tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@mzohreva
mzohreva committed May 6, 2020
1 parent 2454a68 commit 7db74be
Show file tree
Hide file tree
Showing 13 changed files with 71 additions and 61 deletions.
1 change: 1 addition & 0 deletions src/test/ui/eprint-on-tls-drop.rs
View file
@@ -1,5 +1,6 @@
// run-pass
// ignore-emscripten no processes
// ignore-sgx no processes

use std::cell::RefCell;
use std::env;
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/issues/issue-15487.rs
View file
Expand Up @@ -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)]

Expand Down
2 changes: 2 additions & 0 deletions src/test/ui/issues/issue-17546.rs
View file
@@ -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

Expand Down
8 changes: 4 additions & 4 deletions src/test/ui/issues/issue-17546.stderr
View file
@@ -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> {
| ^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/lint/use_suggestion_json.rs
View file
@@ -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
Expand Down
106 changes: 53 additions & 53 deletions src/test/ui/lint/use_suggestion_json.stderr
View file
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/proc-macro/crt-static.rs
View file
Expand Up @@ -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"]

Expand Down
2 changes: 2 additions & 0 deletions src/test/ui/resolve/issue-16058.rs
View file
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/resolve/issue-16058.stderr
View file
@@ -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
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/test-panic-abort-nocapture.rs
View file
Expand Up @@ -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)]

Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/test-panic-abort-nocapture.run.stderr
View file
@@ -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
1 change: 1 addition & 0 deletions src/test/ui/test-panic-abort.rs
View file
Expand Up @@ -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)]

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/test-panic-abort.run.stdout
View file
Expand Up @@ -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


Expand Down

0 comments on commit 7db74be

Please sign in to comment.