T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync expected successful tests on AArch64 (#1581)

Browse Source 
* Sync expected successful tests on AArch64

Fixes CI for recent merges which have fixed features on AArch64!

* Enable more passing tests
This commit is contained in:
Alex Crichton
2020-04-22 17:43:59 -05:00
committed by GitHub
parent 2f1a2f4225
commit d8920c0125
3 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.rs
View File

@@ -237,23 +237,17 @@ fn should_panic(testsuite: &str, testname: &str) -> bool {
} }
match (testsuite, testname) { match (testsuite, testname) {
// FIXME(#1521) // FIXME(#1521)
("bulk_memory_operations", "imports") ("misc_testsuite", "func_400_params")
| ("misc_testsuite", "func_400_params")
| ("misc_testsuite", "misc_traps") | ("misc_testsuite", "misc_traps")
| ("simd", _) | ("simd", _)
| ("multi_value", "call") | ("multi_value", "call")
| ("spec_testsuite", "address")
| ("spec_testsuite", "align")
| ("spec_testsuite", "call") | ("spec_testsuite", "call")
| ("spec_testsuite", "conversions") | ("spec_testsuite", "conversions")
| ("spec_testsuite", "f32_bitwise") | ("spec_testsuite", "f32_bitwise")
| ("spec_testsuite", "float_misc") | ("spec_testsuite", "float_misc")
| ("spec_testsuite", "i32") | ("spec_testsuite", "i32")
| ("spec_testsuite", "i64") | ("spec_testsuite", "i64")
| ("spec_testsuite", "imports")
| ("spec_testsuite", "int_exprs") | ("spec_testsuite", "int_exprs")
| ("spec_testsuite", "memory_grow")
| ("spec_testsuite", "memory_trap")
| ("spec_testsuite", "traps") => true, | ("spec_testsuite", "traps") => true,
_ => false, _ => false,

4
crates/test-programs/build.rs
View File

@@ -200,10 +200,6 @@ mod wasi_tests {
if #[cfg(not(windows))] { if #[cfg(not(windows))] {
/// Ignore tests that aren't supported yet. /// Ignore tests that aren't supported yet.
fn ignore(testsuite: &str, name: &str) -> bool { fn ignore(testsuite: &str, name: &str) -> bool {
let target = env::var("TARGET").unwrap();
if target.contains("aarch64") {
return true; // FIXME(#1521)
}
if testsuite == "wasi-tests" { if testsuite == "wasi-tests" {
match name { match name {
// TODO: virtfs files cannot be poll_oneoff'd yet // TODO: virtfs files cannot be poll_oneoff'd yet

5
tests/all/cli_tests.rs
View File

@@ -54,7 +54,6 @@ fn build_wasm(wat_path: impl AsRef<Path>) -> Result<NamedTempFile> {
// Very basic use case: compile binary wasm file and run specific function with arguments. // Very basic use case: compile binary wasm file and run specific function with arguments.
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521)
fn run_wasmtime_simple() -> Result<()> { fn run_wasmtime_simple() -> Result<()> {
let wasm = build_wasm("tests/wasm/simple.wat")?; let wasm = build_wasm("tests/wasm/simple.wat")?;
run_wasmtime(&[ run_wasmtime(&[
@@ -70,7 +69,6 @@ fn run_wasmtime_simple() -> Result<()> {
// Wasmtime shakk when not enough arguments were provided. // Wasmtime shakk when not enough arguments were provided.
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521)
fn run_wasmtime_simple_fail_no_args() -> Result<()> { fn run_wasmtime_simple_fail_no_args() -> Result<()> {
let wasm = build_wasm("tests/wasm/simple.wat")?; let wasm = build_wasm("tests/wasm/simple.wat")?;
assert!( assert!(
@@ -89,7 +87,6 @@ fn run_wasmtime_simple_fail_no_args() -> Result<()> {
// Running simple wat // Running simple wat
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521)
fn run_wasmtime_simple_wat() -> Result<()> { fn run_wasmtime_simple_wat() -> Result<()> {
let wasm = build_wasm("tests/wasm/simple.wat")?; let wasm = build_wasm("tests/wasm/simple.wat")?;
run_wasmtime(&[ run_wasmtime(&[
@@ -129,7 +126,6 @@ fn run_wasmtime_unreachable_wat() -> Result<()> {
// Run a simple WASI hello world, snapshot0 edition. // Run a simple WASI hello world, snapshot0 edition.
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521)
fn hello_wasi_snapshot0() -> Result<()> { fn hello_wasi_snapshot0() -> Result<()> {
let wasm = build_wasm("tests/wasm/hello_wasi_snapshot0.wat")?; let wasm = build_wasm("tests/wasm/hello_wasi_snapshot0.wat")?;
let stdout = run_wasmtime(&[wasm.path().to_str().unwrap(), "--disable-cache"])?; let stdout = run_wasmtime(&[wasm.path().to_str().unwrap(), "--disable-cache"])?;
@@ -139,7 +135,6 @@ fn hello_wasi_snapshot0() -> Result<()> {
// Run a simple WASI hello world, snapshot1 edition. // Run a simple WASI hello world, snapshot1 edition.
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521)
fn hello_wasi_snapshot1() -> Result<()> { fn hello_wasi_snapshot1() -> Result<()> {
let wasm = build_wasm("tests/wasm/hello_wasi_snapshot1.wat")?; let wasm = build_wasm("tests/wasm/hello_wasi_snapshot1.wat")?;
let stdout = run_wasmtime(&[wasm.path().to_str().unwrap(), "--disable-cache"])?; let stdout = run_wasmtime(&[wasm.path().to_str().unwrap(), "--disable-cache"])?;