Update test ignore annotations for aarch64 (#1643)

Looks like everything is in general passing now so it's probably time to
close #1521 and all other remaining tests that are failing are
classified under new more focused issues.

Closes #1521
This commit is contained in:
Alex Crichton
2020-05-01 11:24:53 -05:00
committed by GitHub
parent 1ec6e6e0eb
commit db92dcd990
5 changed files with 24 additions and 24 deletions

View File

@@ -970,7 +970,6 @@ mod tests {
use tempfile::TempDir; use tempfile::TempDir;
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521)
fn cache_accounts_for_opt_level() -> Result<()> { fn cache_accounts_for_opt_level() -> Result<()> {
let td = TempDir::new()?; let td = TempDir::new()?;
let config_path = td.path().join("config.toml"); let config_path = td.path().join("config.toml");
@@ -1018,15 +1017,18 @@ mod tests {
assert_eq!(store.engine().config.cache_config.cache_hits(), 1); assert_eq!(store.engine().config.cache_config.cache_hits(), 1);
assert_eq!(store.engine().config.cache_config.cache_misses(), 1); assert_eq!(store.engine().config.cache_config.cache_misses(), 1);
let mut cfg = Config::new(); // FIXME(#1523) need debuginfo on aarch64 before we run this test there
cfg.debug_info(true).cache_config_load(&config_path)?; if !cfg!(target_arch = "aarch64") {
let store = Store::new(&Engine::new(&cfg)); let mut cfg = Config::new();
Module::new(&store, "(module (func))")?; cfg.debug_info(true).cache_config_load(&config_path)?;
assert_eq!(store.engine().config.cache_config.cache_hits(), 0); let store = Store::new(&Engine::new(&cfg));
assert_eq!(store.engine().config.cache_config.cache_misses(), 1); Module::new(&store, "(module (func))")?;
Module::new(&store, "(module (func))")?; assert_eq!(store.engine().config.cache_config.cache_hits(), 0);
assert_eq!(store.engine().config.cache_config.cache_hits(), 1); assert_eq!(store.engine().config.cache_config.cache_misses(), 1);
assert_eq!(store.engine().config.cache_config.cache_misses(), 1); Module::new(&store, "(module (func))")?;
assert_eq!(store.engine().config.cache_config.cache_hits(), 1);
assert_eq!(store.engine().config.cache_config.cache_misses(), 1);
}
Ok(()) Ok(())
} }

View File

@@ -102,7 +102,6 @@ fn run_wasmtime_simple_wat() -> Result<()> {
// Running a wat that traps. // Running a wat that traps.
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521)
fn run_wasmtime_unreachable_wat() -> Result<()> { fn run_wasmtime_unreachable_wat() -> Result<()> {
let wasm = build_wasm("tests/wasm/unreachable.wat")?; let wasm = build_wasm("tests/wasm/unreachable.wat")?;
let output = run_wasmtime_for_output(&[wasm.path().to_str().unwrap(), "--disable-cache"])?; let output = run_wasmtime_for_output(&[wasm.path().to_str().unwrap(), "--disable-cache"])?;

View File

@@ -87,7 +87,6 @@ mod tests {
} }
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521)
fn test_custom_signal_handler_single_instance() -> Result<()> { fn test_custom_signal_handler_single_instance() -> Result<()> {
let engine = Engine::new(&Config::default()); let engine = Engine::new(&Config::default());
let store = Store::new(&engine); let store = Store::new(&engine);

View File

@@ -21,7 +21,7 @@ fn instantiate_empty_module_with_memory() {
} }
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", should_panic)] // FIXME(#1521) #[cfg_attr(target_arch = "aarch64", should_panic)] // FIXME(#1523)
fn instantiate_module_that_compiled_to_x64_has_register_32() { fn instantiate_module_that_compiled_to_x64_has_register_32() {
let mut config = Config::new(); let mut config = Config::new();
config.debug_info(true); config.debug_info(true);

View File

@@ -31,7 +31,7 @@ fn test_trap_return() -> Result<()> {
} }
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521) #[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1642)
fn test_trap_trace() -> Result<()> { fn test_trap_trace() -> Result<()> {
let store = Store::default(); let store = Store::default();
let wat = r#" let wat = r#"
@@ -73,7 +73,7 @@ fn test_trap_trace() -> Result<()> {
} }
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521) #[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1642)
fn test_trap_trace_cb() -> Result<()> { fn test_trap_trace_cb() -> Result<()> {
let store = Store::default(); let store = Store::default();
let wat = r#" let wat = r#"
@@ -109,7 +109,7 @@ fn test_trap_trace_cb() -> Result<()> {
} }
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521) #[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1642)
fn test_trap_stack_overflow() -> Result<()> { fn test_trap_stack_overflow() -> Result<()> {
let store = Store::default(); let store = Store::default();
let wat = r#" let wat = r#"
@@ -141,7 +141,7 @@ fn test_trap_stack_overflow() -> Result<()> {
} }
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521) #[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1642)
fn trap_display_pretty() -> Result<()> { fn trap_display_pretty() -> Result<()> {
let store = Store::default(); let store = Store::default();
let wat = r#" let wat = r#"
@@ -173,7 +173,7 @@ wasm backtrace:
} }
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521) #[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1642)
fn trap_display_multi_module() -> Result<()> { fn trap_display_multi_module() -> Result<()> {
let store = Store::default(); let store = Store::default();
let wat = r#" let wat = r#"
@@ -218,7 +218,7 @@ wasm backtrace:
} }
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521) #[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1642)
fn trap_start_function_import() -> Result<()> { fn trap_start_function_import() -> Result<()> {
let store = Store::default(); let store = Store::default();
let binary = wat::parse_str( let binary = wat::parse_str(
@@ -239,7 +239,7 @@ fn trap_start_function_import() -> Result<()> {
} }
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521) #[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1642)
fn rust_panic_import() -> Result<()> { fn rust_panic_import() -> Result<()> {
let store = Store::default(); let store = Store::default();
let binary = wat::parse_str( let binary = wat::parse_str(
@@ -283,7 +283,7 @@ fn rust_panic_import() -> Result<()> {
} }
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521) #[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1642)
fn rust_panic_start_function() -> Result<()> { fn rust_panic_start_function() -> Result<()> {
let store = Store::default(); let store = Store::default();
let binary = wat::parse_str( let binary = wat::parse_str(
@@ -317,7 +317,7 @@ fn rust_panic_start_function() -> Result<()> {
} }
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521) #[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1642)
fn mismatched_arguments() -> Result<()> { fn mismatched_arguments() -> Result<()> {
let store = Store::default(); let store = Store::default();
let binary = wat::parse_str( let binary = wat::parse_str(
@@ -349,7 +349,7 @@ fn mismatched_arguments() -> Result<()> {
} }
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521) #[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1642)
fn call_signature_mismatch() -> Result<()> { fn call_signature_mismatch() -> Result<()> {
let store = Store::default(); let store = Store::default();
let binary = wat::parse_str( let binary = wat::parse_str(
@@ -378,7 +378,7 @@ fn call_signature_mismatch() -> Result<()> {
} }
#[test] #[test]
#[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1521) #[cfg_attr(target_arch = "aarch64", ignore)] // FIXME(#1642)
fn start_trap_pretty() -> Result<()> { fn start_trap_pretty() -> Result<()> {
let store = Store::default(); let store = Store::default();
let wat = r#" let wat = r#"