Skip to content

Commit 7db74be

Browse files
mzohrevamzohreva
committed
Ignore SGX on a few ui tests
1 parent 2454a68 commit 7db74be

13 files changed

+71
-61
lines changed

‎src/test/ui/eprint-on-tls-drop.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// run-pass
22
// ignore-emscripten no processes
3+
// ignore-sgx no processes
34

45
use std::cell::RefCell;
56
use std::env;

‎src/test/ui/issues/issue-15487.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#![allow(unused_attributes)]
33
// ignore-windows
44
// ignore-wasm32-bare no libs to link
5+
// ignore-sgx no libs to link
56

67
#![feature(link_args)]
78

‎src/test/ui/issues/issue-17546.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore-sgx std::os::fortanix_sgx::usercalls::raw::Result changes compiler suggestions
2+
13
use foo::MyEnum::Result;
24
use foo::NoResult; // Through a re-export
35

‎src/test/ui/issues/issue-17546.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0573]: expected type, found variant `NoResult`
2-
--> $DIR/issue-17546.rs:12:17
2+
--> $DIR/issue-17546.rs:14:17
33
|
44
LL | fn new() -> NoResult<MyEnum, String> {
55
| ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -19,7 +19,7 @@ LL | fn new() -> Result<MyEnum, String> {
1919
| ^^^^^^
2020

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

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

5757
error[E0573]: expected type, found variant `NoResult`
58-
--> $DIR/issue-17546.rs:33:15
58+
--> $DIR/issue-17546.rs:35:15
5959
|
6060
LL | fn newer() -> NoResult<foo::MyEnum, String> {
6161
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎src/test/ui/lint/use_suggestion_json.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// ignore-cloudabi
22
// ignore-windows
3+
// ignore-sgx std::os::fortanix_sgx::usercalls::alloc::Iter changes compiler suggestions
34
// compile-flags: --error-format pretty-json --json=diagnostic-rendered-ansi
45

56
// The output for humans should just highlight the whole span without showing

‎src/test/ui/lint/use_suggestion_json.stderr

+53-53
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ mod foo {
7272
"spans": [
7373
{
7474
"file_name": "$DIR/use_suggestion_json.rs",
75-
"byte_start": 471,
76-
"byte_end": 475,
77-
"line_start": 12,
78-
"line_end": 12,
75+
"byte_start": 560,
76+
"byte_end": 564,
77+
"line_start": 13,
78+
"line_end": 13,
7979
"column_start": 12,
8080
"column_end": 16,
8181
"is_primary": true,
@@ -100,10 +100,10 @@ mod foo {
100100
"spans": [
101101
{
102102
"file_name": "$DIR/use_suggestion_json.rs",
103-
"byte_start": 448,
104-
"byte_end": 448,
105-
"line_start": 11,
106-
"line_end": 11,
103+
"byte_start": 537,
104+
"byte_end": 537,
105+
"line_start": 12,
106+
"line_end": 12,
107107
"column_start": 1,
108108
"column_end": 1,
109109
"is_primary": true,
@@ -123,10 +123,10 @@ mod foo {
123123
},
124124
{
125125
"file_name": "$DIR/use_suggestion_json.rs",
126-
"byte_start": 448,
127-
"byte_end": 448,
128-
"line_start": 11,
129-
"line_end": 11,
126+
"byte_start": 537,
127+
"byte_end": 537,
128+
"line_start": 12,
129+
"line_end": 12,
130130
"column_start": 1,
131131
"column_end": 1,
132132
"is_primary": true,
@@ -146,10 +146,10 @@ mod foo {
146146
},
147147
{
148148
"file_name": "$DIR/use_suggestion_json.rs",
149-
"byte_start": 448,
150-
"byte_end": 448,
151-
"line_start": 11,
152-
"line_end": 11,
149+
"byte_start": 537,
150+
"byte_end": 537,
151+
"line_start": 12,
152+
"line_end": 12,
153153
"column_start": 1,
154154
"column_end": 1,
155155
"is_primary": true,
@@ -169,10 +169,10 @@ mod foo {
169169
},
170170
{
171171
"file_name": "$DIR/use_suggestion_json.rs",
172-
"byte_start": 448,
173-
"byte_end": 448,
174-
"line_start": 11,
175-
"line_end": 11,
172+
"byte_start": 537,
173+
"byte_end": 537,
174+
"line_start": 12,
175+
"line_end": 12,
176176
"column_start": 1,
177177
"column_end": 1,
178178
"is_primary": true,
@@ -192,10 +192,10 @@ mod foo {
192192
},
193193
{
194194
"file_name": "$DIR/use_suggestion_json.rs",
195-
"byte_start": 448,
196-
"byte_end": 448,
197-
"line_start": 11,
198-
"line_end": 11,
195+
"byte_start": 537,
196+
"byte_end": 537,
197+
"line_start": 12,
198+
"line_end": 12,
199199
"column_start": 1,
200200
"column_end": 1,
201201
"is_primary": true,
@@ -215,10 +215,10 @@ mod foo {
215215
},
216216
{
217217
"file_name": "$DIR/use_suggestion_json.rs",
218-
"byte_start": 448,
219-
"byte_end": 448,
220-
"line_start": 11,
221-
"line_end": 11,
218+
"byte_start": 537,
219+
"byte_end": 537,
220+
"line_start": 12,
221+
"line_end": 12,
222222
"column_start": 1,
223223
"column_end": 1,
224224
"is_primary": true,
@@ -238,10 +238,10 @@ mod foo {
238238
},
239239
{
240240
"file_name": "$DIR/use_suggestion_json.rs",
241-
"byte_start": 448,
242-
"byte_end": 448,
243-
"line_start": 11,
244-
"line_end": 11,
241+
"byte_start": 537,
242+
"byte_end": 537,
243+
"line_start": 12,
244+
"line_end": 12,
245245
"column_start": 1,
246246
"column_end": 1,
247247
"is_primary": true,
@@ -261,10 +261,10 @@ mod foo {
261261
},
262262
{
263263
"file_name": "$DIR/use_suggestion_json.rs",
264-
"byte_start": 448,
265-
"byte_end": 448,
266-
"line_start": 11,
267-
"line_end": 11,
264+
"byte_start": 537,
265+
"byte_end": 537,
266+
"line_start": 12,
267+
"line_end": 12,
268268
"column_start": 1,
269269
"column_end": 1,
270270
"is_primary": true,
@@ -284,10 +284,10 @@ mod foo {
284284
},
285285
{
286286
"file_name": "$DIR/use_suggestion_json.rs",
287-
"byte_start": 448,
288-
"byte_end": 448,
289-
"line_start": 11,
290-
"line_end": 11,
287+
"byte_start": 537,
288+
"byte_end": 537,
289+
"line_start": 12,
290+
"line_end": 12,
291291
"column_start": 1,
292292
"column_end": 1,
293293
"is_primary": true,
@@ -307,10 +307,10 @@ mod foo {
307307
},
308308
{
309309
"file_name": "$DIR/use_suggestion_json.rs",
310-
"byte_start": 448,
311-
"byte_end": 448,
312-
"line_start": 11,
313-
"line_end": 11,
310+
"byte_start": 537,
311+
"byte_end": 537,
312+
"line_start": 12,
313+
"line_end": 12,
314314
"column_start": 1,
315315
"column_end": 1,
316316
"is_primary": true,
@@ -330,10 +330,10 @@ mod foo {
330330
},
331331
{
332332
"file_name": "$DIR/use_suggestion_json.rs",
333-
"byte_start": 448,
334-
"byte_end": 448,
335-
"line_start": 11,
336-
"line_end": 11,
333+
"byte_start": 537,
334+
"byte_end": 537,
335+
"line_start": 12,
336+
"line_end": 12,
337337
"column_start": 1,
338338
"column_end": 1,
339339
"is_primary": true,
@@ -353,10 +353,10 @@ mod foo {
353353
},
354354
{
355355
"file_name": "$DIR/use_suggestion_json.rs",
356-
"byte_start": 448,
357-
"byte_end": 448,
358-
"line_start": 11,
359-
"line_end": 11,
356+
"byte_start": 537,
357+
"byte_end": 537,
358+
"line_start": 12,
359+
"line_end": 12,
360360
"column_start": 1,
361361
"column_end": 1,
362362
"is_primary": true,
@@ -380,7 +380,7 @@ mod foo {
380380
}
381381
],
382382
"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
383-
\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
383+
\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
384384
\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m
385385
\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
386386
\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

‎src/test/ui/proc-macro/crt-static.rs

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// override -Ctarget-feature=-crt-static from compiletest
44
// compile-flags: -Ctarget-feature=
55
// ignore-wasm32
6+
// ignore-sgx no support for proc-macro crate type
67
// build-pass
78
#![crate_type = "proc-macro"]
89

‎src/test/ui/resolve/issue-16058.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore-sgx std::os::fortanix_sgx::usercalls::raw::Result changes compiler suggestions
2+
13
pub struct GslResult {
24
pub val: f64,
35
pub err: f64

‎src/test/ui/resolve/issue-16058.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0574]: expected struct, variant or union type, found enum `Result`
2-
--> $DIR/issue-16058.rs:8:9
2+
--> $DIR/issue-16058.rs:10:9
33
|
44
LL | Result {
55
| ^^^^^^ not a struct, variant or union type

‎src/test/ui/test-panic-abort-nocapture.rs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
// ignore-wasm no panic or subprocess support
99
// ignore-emscripten no panic or subprocess support
10+
// ignore-sgx no subprocess support
1011

1112
#![cfg(test)]
1213

‎src/test/ui/test-panic-abort-nocapture.run.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
thread 'main' panicked at 'assertion failed: `(left == right)`
22
left: `2`,
3-
right: `4`', $DIR/test-panic-abort-nocapture.rs:31:5
3+
right: `4`', $DIR/test-panic-abort-nocapture.rs:32:5
44
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
55
thread 'main' panicked at 'assertion failed: `(left == right)`
66
left: `2`,
7-
right: `4`', $DIR/test-panic-abort-nocapture.rs:25:5
7+
right: `4`', $DIR/test-panic-abort-nocapture.rs:26:5
88
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
99
testing321

‎src/test/ui/test-panic-abort.rs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
// ignore-wasm no panic or subprocess support
99
// ignore-emscripten no panic or subprocess support
10+
// ignore-sgx no subprocess support
1011

1112
#![cfg(test)]
1213

‎src/test/ui/test-panic-abort.run.stdout

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ testing123
1818
testing321
1919
thread 'main' panicked at 'assertion failed: `(left == right)`
2020
left: `2`,
21-
right: `5`', $DIR/test-panic-abort.rs:32:5
21+
right: `5`', $DIR/test-panic-abort.rs:33:5
2222
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2323

2424

0 commit comments

Comments
 (0)