Skip to content

Commit 90bf0d2

Browse files
estebankestebank
committed
Ignore i586-unknown-linux-gnu and i586-unknown-musl in tests
1 parent 52b4681 commit 90bf0d2

File tree

90 files changed

+267
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+267
-131
lines changed

‎src/etc/generate-deriving-span-tests.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
os.path.join(os.path.dirname(__file__), '../test/ui/derives/'))
1515

1616
TEMPLATE = """\
17-
// ignore-x86 FIXME: missing sysroot spans (#53081)
17+
// FIXME: missing sysroot spans (#53081)
18+
// ignore-i586-unknown-linux-gnu
19+
// ignore-i586-unknown-linux-musl
1820
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
1921
2022
{error_deriving}

‎src/test/ui/async-await/issues/issue-62009-1.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// edition:2018
2-
// ignore-x86 FIXME: missing sysroot spans (#53081)
2+
// FIXME: missing sysroot spans (#53081)
3+
// ignore-i586-unknown-linux-gnu
4+
// ignore-i586-unknown-linux-musl
5+
// ignore-i686-unknown-linux-musl
36

47
async fn print_dur() {}
58

‎src/test/ui/async-await/issues/issue-62009-1.stderr

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error[E0728]: `await` is only allowed inside `async` functions and blocks
2-
--> $DIR/issue-62009-1.rs:7:5
2+
--> $DIR/issue-62009-1.rs:10:5
33
|
44
LL | fn main() {
55
| ---- this is not `async`
66
LL | async { let (); }.await;
77
| ^^^^^^^^^^^^^^^^^^^^^^^ only allowed inside `async` functions and blocks
88

99
error[E0728]: `await` is only allowed inside `async` functions and blocks
10-
--> $DIR/issue-62009-1.rs:9:5
10+
--> $DIR/issue-62009-1.rs:12:5
1111
|
1212
LL | fn main() {
1313
| ---- this is not `async`
@@ -19,19 +19,19 @@ LL | | }.await;
1919
| |___________^ only allowed inside `async` functions and blocks
2020

2121
error[E0728]: `await` is only allowed inside `async` functions and blocks
22-
--> $DIR/issue-62009-1.rs:13:5
22+
--> $DIR/issue-62009-1.rs:16:5
2323
|
2424
LL | fn main() {
2525
| ---- this is not `async`
2626
...
2727
LL | (|_| 2333).await;
2828
| ^^^^^^^^^^^^^^^^ only allowed inside `async` functions and blocks
2929

30-
error[E0277]: the trait bound `[closure@$DIR/issue-62009-1.rs:13:5: 13:15]: std::future::Future` is not satisfied
31-
--> $DIR/issue-62009-1.rs:13:5
30+
error[E0277]: the trait bound `[closure@$DIR/issue-62009-1.rs:16:5: 16:15]: std::future::Future` is not satisfied
31+
--> $DIR/issue-62009-1.rs:16:5
3232
|
3333
LL | (|_| 2333).await;
34-
| ^^^^^^^^^^^^^^^^ the trait `std::future::Future` is not implemented for `[closure@$DIR/issue-62009-1.rs:13:5: 13:15]`
34+
| ^^^^^^^^^^^^^^^^ the trait `std::future::Future` is not implemented for `[closure@$DIR/issue-62009-1.rs:16:5: 16:15]`
3535
|
3636
= note: required by `std::future::IntoFuture::into_future`
3737

‎src/test/ui/closures/closure-move-sync.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
4+
// ignore-i686-unknown-linux-musl
25
use std::thread;
36
use std::sync::mpsc::channel;
47

‎src/test/ui/closures/closure-move-sync.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: `std::sync::mpsc::Receiver<()>` cannot be shared between threads safely
2-
--> $DIR/closure-move-sync.rs:7:13
2+
--> $DIR/closure-move-sync.rs:10:13
33
|
44
LL | let t = thread::spawn(|| {
55
| ^^^^^^^^^^^^^ `std::sync::mpsc::Receiver<()>` cannot be shared between threads safely
@@ -11,10 +11,10 @@ LL | F: Send + 'static,
1111
|
1212
= help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Receiver<()>`
1313
= note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Receiver<()>`
14-
= note: required because it appears within the type `[closure@$DIR/closure-move-sync.rs:7:27: 10:6 recv:&std::sync::mpsc::Receiver<()>]`
14+
= note: required because it appears within the type `[closure@$DIR/closure-move-sync.rs:10:27: 13:6 recv:&std::sync::mpsc::Receiver<()>]`
1515

1616
error[E0277]: `std::sync::mpsc::Sender<()>` cannot be shared between threads safely
17-
--> $DIR/closure-move-sync.rs:19:5
17+
--> $DIR/closure-move-sync.rs:22:5
1818
|
1919
LL | thread::spawn(|| tx.send(()).unwrap());
2020
| ^^^^^^^^^^^^^ `std::sync::mpsc::Sender<()>` cannot be shared between threads safely
@@ -26,7 +26,7 @@ LL | F: Send + 'static,
2626
|
2727
= help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Sender<()>`
2828
= note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Sender<()>`
29-
= note: required because it appears within the type `[closure@$DIR/closure-move-sync.rs:19:19: 19:42 tx:&std::sync::mpsc::Sender<()>]`
29+
= note: required because it appears within the type `[closure@$DIR/closure-move-sync.rs:22:19: 22:42 tx:&std::sync::mpsc::Sender<()>]`
3030

3131
error: aborting due to 2 previous errors
3232

‎src/test/ui/consts/const-size_of-cycle.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
4+
// ignore-i686-unknown-linux-musl
25
// error-pattern: cycle detected
36

47
struct Foo {

‎src/test/ui/consts/const-size_of-cycle.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
error[E0391]: cycle detected when const-evaluating + checking `Foo::bytes::{{constant}}#0`
2-
--> $DIR/const-size_of-cycle.rs:5:17
2+
--> $DIR/const-size_of-cycle.rs:8:17
33
|
44
LL | bytes: [u8; std::mem::size_of::<Foo>()]
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
note: ...which requires const-evaluating + checking `Foo::bytes::{{constant}}#0`...
8-
--> $DIR/const-size_of-cycle.rs:5:17
8+
--> $DIR/const-size_of-cycle.rs:8:17
99
|
1010
LL | bytes: [u8; std::mem::size_of::<Foo>()]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
1212
note: ...which requires const-evaluating `Foo::bytes::{{constant}}#0`...
13-
--> $DIR/const-size_of-cycle.rs:5:17
13+
--> $DIR/const-size_of-cycle.rs:8:17
1414
|
1515
LL | bytes: [u8; std::mem::size_of::<Foo>()]
1616
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -28,7 +28,7 @@ LL | pub fn size_of<T>() -> usize;
2828
= note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All, def_id: None }, value: [u8; _] }`...
2929
= note: ...which again requires const-evaluating + checking `Foo::bytes::{{constant}}#0`, completing the cycle
3030
note: cycle used when processing `Foo`
31-
--> $DIR/const-size_of-cycle.rs:4:1
31+
--> $DIR/const-size_of-cycle.rs:7:1
3232
|
3333
LL | struct Foo {
3434
| ^^^^^^^^^^

‎src/test/ui/consts/miri_unleashed/drop.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// compile-flags: -Zunleash-the-miri-inside-of-you
2-
// ignore-x86 FIXME: missing sysroot spans (#53081)
2+
// FIXME: missing sysroot spans (#53081)
3+
// ignore-i586-unknown-linux-gnu
4+
// ignore-i586-unknown-linux-musl
5+
// ignore-i686-unknown-linux-musl
36
// error-pattern: calling non-const function `<std::vec::Vec<i32> as std::ops::Drop>::drop`
47
#![deny(const_err)]
58

‎src/test/ui/consts/miri_unleashed/drop.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: skipping const checks
2-
--> $DIR/drop.rs:18:9
2+
--> $DIR/drop.rs:21:9
33
|
44
LL | let _v: Vec<i32> = Vec::new();
55
| ^^
@@ -14,10 +14,10 @@ LL | | real_drop_in_place(to_drop)
1414
LL | | }
1515
| |_^ calling non-const function `<std::vec::Vec<i32> as std::ops::Drop>::drop`
1616
|
17-
::: $DIR/drop.rs:20:1
17+
::: $DIR/drop.rs:23:1
1818
|
1919
LL | };
20-
| - inside call to `std::ptr::real_drop_in_place::<std::vec::Vec<i32>> - shim(Some(std::vec::Vec<i32>))` at $DIR/drop.rs:20:1
20+
| - inside call to `std::ptr::real_drop_in_place::<std::vec::Vec<i32>> - shim(Some(std::vec::Vec<i32>))` at $DIR/drop.rs:23:1
2121

2222
error: aborting due to previous error
2323

‎src/test/ui/consts/offset_from_ub.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
4+
// ignore-i686-unknown-linux-musl
25

36
#![feature(const_raw_ptr_deref)]
47
#![feature(const_ptr_offset_from)]

0 commit comments

Comments
 (0)