Skip to content

Commit d96cc6e

Browse files
committed
Auto merge of #47127 - EdSchouten:cloudabi-tests, r=kennytm
First cut at getting some part of the test suite working for CloudABI I am currently working on creating a Docker container for automated CI for CloudABI. Here are some of the trivial changes that need to land to make tests pass.
2 parents 8d1a302 + 3ca407e commit d96cc6e

File tree

102 files changed

+253
-150
lines changed

Some content is hidden

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

102 files changed

+253
-150
lines changed

src/libtest/lib.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -977,15 +977,13 @@ fn use_color(opts: &TestOpts) -> bool {
977977
}
978978
}
979979

980-
#[cfg(target_os = "redox")]
980+
#[cfg(any(target_os = "cloudabi",
981+
target_os = "redox",
982+
all(target_arch = "wasm32", not(target_os = "emscripten"))))]
981983
fn stdout_isatty() -> bool {
982984
// FIXME: Implement isatty on Redox
983985
false
984986
}
985-
#[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
986-
fn stdout_isatty() -> bool {
987-
false
988-
}
989987
#[cfg(unix)]
990988
fn stdout_isatty() -> bool {
991989
unsafe { libc::isatty(libc::STDOUT_FILENO) != 0 }

src/test/codegen/dllimports/main.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,20 @@
99
// except according to those terms.
1010

1111
// This test is for *-windows-msvc only.
12-
// ignore-gnu
1312
// ignore-android
1413
// ignore-bitrig
15-
// ignore-macos
14+
// ignore-cloudabi
1615
// ignore-dragonfly
16+
// ignore-emscripten
1717
// ignore-freebsd
18+
// ignore-gnu
1819
// ignore-haiku
1920
// ignore-ios
2021
// ignore-linux
22+
// ignore-macos
2123
// ignore-netbsd
2224
// ignore-openbsd
2325
// ignore-solaris
24-
// ignore-emscripten
2526

2627
// aux-build:dummy.rs
2728
// aux-build:wrapper.rs

src/test/codegen/panic-abort-windows.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@
1313
// This test is for *-windows-msvc only.
1414
// ignore-android
1515
// ignore-bitrig
16-
// ignore-macos
16+
// ignore-cloudabi
1717
// ignore-dragonfly
18+
// ignore-emscripten
1819
// ignore-freebsd
1920
// ignore-haiku
2021
// ignore-ios
2122
// ignore-linux
23+
// ignore-macos
2224
// ignore-netbsd
2325
// ignore-openbsd
2426
// ignore-solaris
25-
// ignore-emscripten
2627

2728
// compile-flags: -C no-prepopulate-passes -C panic=abort -O
2829

src/test/compile-fail/E0277.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-cloudabi no std::path
12+
1113
use std::path::Path;
1214

1315
trait Foo {

src/test/compile-fail/cdylib-deps-must-be-static.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// error-pattern: crate `cdylib_dep` required to be available in rlib format, but was not found
1212
// aux-build:cdylib-dep.rs
1313
// ignore-musl
14+
// ignore-cloudabi
1415
// ignore-emscripten
1516

1617
#![crate_type = "cdylib"]

src/test/compile-fail/issue-13352.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-cloudabi no std::process
12+
1113
fn foo(_: Box<FnMut()>) {}
1214

1315
fn main() {

src/test/compile-fail/issue-37665.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// compile-flags: -Z unstable-options --unpretty=mir
12+
// ignore-cloudabi no std::path
1213

1314
use std::path::MAIN_SEPARATOR;
1415

src/test/compile-fail/panic-runtime/abort-link-to-unwind-dylib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// compile-flags:-C panic=abort -C prefer-dynamic
1212
// ignore-musl - no dylibs here
13+
// ignore-cloudabi
1314
// ignore-emscripten
1415
// error-pattern:`panic_unwind` is not compiled with this crate's panic strategy
1516

src/test/parse-fail/mod_file_not_exist_windows.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,20 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-gnu
1211
// ignore-android
1312
// ignore-bitrig
14-
// ignore-macos
13+
// ignore-cloudabi
1514
// ignore-dragonfly
15+
// ignore-emscripten
1616
// ignore-freebsd
17+
// ignore-gnu
1718
// ignore-haiku
1819
// ignore-ios
1920
// ignore-linux
21+
// ignore-macos
2022
// ignore-netbsd
2123
// ignore-openbsd
2224
// ignore-solaris
23-
// ignore-emscripten
2425

2526
// compile-flags: -Z parse-only
2627

src/test/run-fail/mir_dynamic_drops_1.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
10+
1011
// error-pattern:drop 1
1112
// error-pattern:drop 2
12-
13+
// ignore-cloudabi no std::process
1314

1415
/// Structure which will not allow to be dropped twice.
1516
struct Droppable<'a>(&'a mut bool, u32);

0 commit comments

Comments
 (0)