Skip to content

Commit

Permalink
Fix tests on wasm
Browse files Browse the repository at this point in the history
The `std` test straightforwardly can't work without file descriptors;
 #99417 tracks moving it out of tests/ui.

`issue-13560.rs` requires the target to support dynamic linking.

`extern-mod-syntax` is interesting. The original test was added to check
if `extern mod` could be parsed correctly and used `extern mod std` and
an import:
138dc30#diff-73700e1e851b7a37bc92174635dab726124c82e5bfabbbc45b4a3c2e8e14fadd
At some point `std::json::Object` was moved out of std to an unstable
rustc-only `extras` crate, and rather than just changing the import it
got changed to use the unstable crate. When `extras` was removed, people
assumed the test was meant to also test rustc_private and changed it to
another unstable crate rather than using something in std.

This changes the test to remove the `rustc_private` import, to allow it
to work properly when cross-compiling.
  • Loading branch information
jyn514 committed Apr 14, 2023
1 parent 2ffb0de commit 88ee6e5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tests/ui/extern-mod-syntax.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// run-pass

#![allow(unused_imports)]
#![feature(rustc_private)]
#![no_std]

extern crate libc;
use libc::c_void;
extern crate std;
use std::ffi::c_void;

pub fn main() {
println!("Hello world!");
std::println!("Hello world!");
}
1 change: 1 addition & 0 deletions tests/ui/issue-13560.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// run-pass
// ignore-cross-compile (needs dylibs and compiletest doesn't have a more specific header)
// aux-build:issue-13560-1.rs
// aux-build:issue-13560-2.rs
// aux-build:issue-13560-3.rs
Expand Down
1 change: 1 addition & 0 deletions tests/ui/std/switch-stdout.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// run-pass
// ignore-wasm (needs file descriptors and env variables)

use std::env;
use std::fs::File;
Expand Down

0 comments on commit 88ee6e5

Please sign in to comment.