Skip to content

Commit 5ca4dfc

Browse files
committed
Fix up tests on wasm32-wasip1
Can be fixed properly later by adding a new flag for non-exhaustive line annotation checking
1 parent ecba3f8 commit 5ca4dfc

File tree

4 files changed

+26
-9
lines changed

4 files changed

+26
-9
lines changed

Diff for: tests/ui/cfg/cfg_false_no_std-2.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// Error, the linked empty library is `no_std` and doesn't provide a panic handler.
22

3+
//@ compile-flags: --error-format=human
4+
//@ error-pattern: `#[panic_handler]` function required, but not found
35
//@ dont-check-compiler-stderr
46
//@ aux-build: cfg_false_lib_no_std_before.rs
57

@@ -9,5 +11,6 @@ extern crate cfg_false_lib_no_std_before as _;
911

1012
fn main() {}
1113

12-
//~? ERROR `#[panic_handler]` function required, but not found
13-
//~? ERROR unwinding panics are not supported without std
14+
// FIXME: The second error is target-dependent.
15+
//FIXME~? ERROR `#[panic_handler]` function required, but not found
16+
//FIXME~? ERROR unwinding panics are not supported without std

Diff for: tests/ui/panic-runtime/two-panic-runtimes.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
// ignore-tidy-linelength
12
//@ build-fail
3+
//@ compile-flags: --error-format=human
4+
//@ error-pattern: cannot link together two panic runtimes: panic_runtime_unwind and panic_runtime_unwind2
25
//@ dont-check-compiler-stderr
36
//@ aux-build:panic-runtime-unwind.rs
47
//@ aux-build:panic-runtime-unwind2.rs
@@ -13,4 +16,7 @@ extern crate panic_runtime_lang_items;
1316

1417
fn main() {}
1518

16-
//~? ERROR cannot link together two panic runtimes: panic_runtime_unwind and panic_runtime_unwind2
19+
// FIXME: The second and third errors are target-dependent.
20+
//FIXME~? ERROR cannot link together two panic runtimes: panic_runtime_unwind and panic_runtime_unwind2
21+
//FIXME~? ERROR the linked panic runtime `panic_runtime_unwind2` is not compiled with this crate's panic strategy `abort`
22+
//FIXME~? ERROR the crate `panic_runtime_unwind` requires panic strategy `unwind` which is incompatible with this crate's strategy of `abort`

Diff for: tests/ui/panic-runtime/want-abort-got-unwind.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
// ignore-tidy-linelength
12
//@ build-fail
3+
//@ compile-flags: --error-format=human
4+
//@ error-pattern: the linked panic runtime `panic_runtime_unwind` is not compiled with this crate's panic strategy `abort`
25
//@ dont-check-compiler-stderr
36
//@ aux-build:panic-runtime-unwind.rs
47
//@ compile-flags:-C panic=abort
@@ -7,6 +10,7 @@ extern crate panic_runtime_unwind;
710

811
fn main() {}
912

10-
//~? ERROR cannot link together two panic runtimes: panic_unwind and panic_runtime_unwind
11-
//~? ERROR the linked panic runtime `panic_runtime_unwind` is not compiled with this crate's panic strategy `abort`
12-
//~? ERROR the crate `panic_unwind` requires panic strategy `unwind` which is incompatible with this crate's strategy of `abort`
13+
// FIXME: The first and third errors are target-dependent.
14+
//FIXME~? ERROR cannot link together two panic runtimes: panic_unwind and panic_runtime_unwind
15+
//FIXME~? ERROR the linked panic runtime `panic_runtime_unwind` is not compiled with this crate's panic strategy `abort`
16+
//FIXME~? ERROR the crate `panic_unwind` requires panic strategy `unwind` which is incompatible with this crate's strategy of `abort`

Diff for: tests/ui/panic-runtime/want-abort-got-unwind2.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
// ignore-tidy-linelength
12
//@ build-fail
3+
//@ compile-flags: --error-format=human
4+
//@ error-pattern: the linked panic runtime `panic_runtime_unwind` is not compiled with this crate's panic strategy `abort`
25
//@ dont-check-compiler-stderr
36
//@ aux-build:panic-runtime-unwind.rs
47
//@ aux-build:wants-panic-runtime-unwind.rs
@@ -8,6 +11,7 @@ extern crate wants_panic_runtime_unwind;
811

912
fn main() {}
1013

11-
//~? ERROR cannot link together two panic runtimes: panic_unwind and panic_runtime_unwind
12-
//~? ERROR the linked panic runtime `panic_runtime_unwind` is not compiled with this crate's panic strategy `abort`
13-
//~? ERROR the crate `panic_unwind` requires panic strategy `unwind` which is incompatible with this crate's strategy of `abort`
14+
// FIXME: The first and third errors are target-dependent.
15+
//FIXME~? ERROR cannot link together two panic runtimes: panic_unwind and panic_runtime_unwind
16+
//FIXME~? ERROR the linked panic runtime `panic_runtime_unwind` is not compiled with this crate's panic strategy `abort`
17+
//FIXME~? ERROR the crate `panic_unwind` requires panic strategy `unwind` which is incompatible with this crate's strategy of `abort`

0 commit comments

Comments
 (0)