Skip to content

Commit

Permalink
Sync expected successful tests on AArch64 (#1581)
Browse files Browse the repository at this point in the history
* Sync expected successful tests on AArch64

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

* Enable more passing tests
  • Loading branch information
alexcrichton authored Apr 22, 2020
1 parent 2f1a2f4 commit d8920c0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 16 deletions.
8 changes: 1 addition & 7 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,23 +237,17 @@ fn should_panic(testsuite: &str, testname: &str) -> bool {
}
match (testsuite, testname) {
// FIXME(#1521)
("bulk_memory_operations", "imports")
| ("misc_testsuite", "func_400_params")
("misc_testsuite", "func_400_params")
| ("misc_testsuite", "misc_traps")
| ("simd", _)
| ("multi_value", "call")
| ("spec_testsuite", "address")
| ("spec_testsuite", "align")
| ("spec_testsuite", "call")
| ("spec_testsuite", "conversions")
| ("spec_testsuite", "f32_bitwise")
| ("spec_testsuite", "float_misc")
| ("spec_testsuite", "i32")
| ("spec_testsuite", "i64")
| ("spec_testsuite", "imports")
| ("spec_testsuite", "int_exprs")
| ("spec_testsuite", "memory_grow")
| ("spec_testsuite", "memory_trap")
| ("spec_testsuite", "traps") => true,

_ => false,
Expand Down
4 changes: 0 additions & 4 deletions crates/test-programs/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,6 @@ mod wasi_tests {
if #[cfg(not(windows))] {
/// Ignore tests that aren't supported yet.
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" {
match name {
// TODO: virtfs files cannot be poll_oneoff'd yet
Expand Down
5 changes: 0 additions & 5 deletions tests/all/cli_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521)
fn run_wasmtime_simple() -> Result<()> {
let wasm = build_wasm("tests/wasm/simple.wat")?;
run_wasmtime(&[
Expand All @@ -70,7 +69,6 @@ fn run_wasmtime_simple() -> Result<()> {

// Wasmtime shakk when not enough arguments were provided.
#[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521)
fn run_wasmtime_simple_fail_no_args() -> Result<()> {
let wasm = build_wasm("tests/wasm/simple.wat")?;
assert!(
Expand All @@ -89,7 +87,6 @@ fn run_wasmtime_simple_fail_no_args() -> Result<()> {

// Running simple wat
#[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521)
fn run_wasmtime_simple_wat() -> Result<()> {
let wasm = build_wasm("tests/wasm/simple.wat")?;
run_wasmtime(&[
Expand Down Expand Up @@ -129,7 +126,6 @@ fn run_wasmtime_unreachable_wat() -> Result<()> {

// Run a simple WASI hello world, snapshot0 edition.
#[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521)
fn hello_wasi_snapshot0() -> Result<()> {
let wasm = build_wasm("tests/wasm/hello_wasi_snapshot0.wat")?;
let stdout = run_wasmtime(&[wasm.path().to_str().unwrap(), "--disable-cache"])?;
Expand All @@ -139,7 +135,6 @@ fn hello_wasi_snapshot0() -> Result<()> {

// Run a simple WASI hello world, snapshot1 edition.
#[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521)
fn hello_wasi_snapshot1() -> Result<()> {
let wasm = build_wasm("tests/wasm/hello_wasi_snapshot1.wat")?;
let stdout = run_wasmtime(&[wasm.path().to_str().unwrap(), "--disable-cache"])?;
Expand Down

0 comments on commit d8920c0

Please sign in to comment.