Try #888:

wasmerio · Oct 18, 2019 · 694d123 · 694d123
2 parents 5ca6fc4 + 94fb176
commit 694d123
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 7 deletions.
diff --git a/lib/spectests/tests/excludes.txt b/lib/spectests/tests/excludes.txt
@@ -32,7 +32,6 @@ clif:fail:linking.wast:147 # AssertTrap - expected trap, got Runtime:Error "unkn
 clif:fail:linking.wast:149 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x106883037 - illegal instruction"
 clif:fail:linking.wast:185 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x106883062 - illegal instruction"
 clif:fail:linking.wast:187 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x106883062 - illegal instruction"
-clif:fail:linking.wast:387 # AssertReturn - result I32(0) ("0x0") does not match expected I32(104) ("0x68")
 clif:fail:linking.wast:388 # AssertReturn - Call failed RuntimeError: WebAssembly trap occurred during runtime: `call_indirect` out-of-bounds
 
 # clif:skip:skip-stack-guard-page.wast:2 # Slow test
@@ -269,7 +268,6 @@ llvm:fail:f32.wast:1621 # AssertReturn - result F32(0) ("0x0") does not match ex
 llvm:fail:f32.wast:2020 # AssertReturn - result F32(2147483648) ("0x80000000") does not match expected F32(0) ("0x0")
 llvm:fail:f64.wast:1621 # AssertReturn - result F64(0) ("0x0") does not match expected F64(9223372036854775808) ("0x8000000000000000")
 llvm:fail:f64.wast:2020 # AssertReturn - result F64(9223372036854775808) ("0x8000000000000000") does not match expected F64(0) ("0x0")
-llvm:fail:linking.wast:387 # AssertReturn - result I32(0) ("0x0") does not match expected I32(104) ("0x68")
 llvm:fail:linking.wast:388 # AssertReturn - Call failed RuntimeError: WebAssembly trap occurred during runtime: incorrect `call_indirect` signature
 
 # LLVM Windows
@@ -957,7 +955,6 @@ singlepass:fail:linking.wast:190 # AssertTrap - expected trap, got Runtime:Error
 singlepass:fail:linking.wast:225 # AssertTrap - expected trap, got Runtime:Error unknown error
 singlepass:fail:linking.wast:236 # AssertTrap - expected trap, got Runtime:Error unknown error
 singlepass:fail:linking.wast:248 # AssertTrap - expected trap, got Runtime:Error unknown error
-singlepass:fail:linking.wast:387 # AssertReturn - result I32(0) ("0x0") does not match expected I32(104) ("0x68")
 singlepass:fail:linking.wast:388 # AssertReturn - Call failed RuntimeError: unknown error
 singlepass:fail:memory_grow.wast:15 # AssertTrap - expected trap, got Runtime:Error unknown error
 singlepass:fail:memory_grow.wast:16 # AssertTrap - expected trap, got Runtime:Error unknown error

diff --git a/lib/spectests/tests/spectest.rs b/lib/spectests/tests/spectest.rs
@@ -720,10 +720,48 @@ mod tests {
                         }
                     }
                 }
-                CommandKind::AssertUninstantiable {
-                    module: _,
-                    message: _,
-                } => println!("AssertUninstantiable not yet implmented "),
+                CommandKind::AssertUninstantiable { module, message: _ } => {
+                    println!("A");
+                    let spectest_import_object = get_spectest_import_object(&registered_modules);
+                    println!("B");
+                    let config = CompilerConfig {
+                        features: Features {
+                            simd: true,
+                            threads: true,
+                        },
+                        ..Default::default()
+                    };
+                    println!("C");
+                    let module = wasmer_runtime_core::compile_with_config(
+                        &module.into_vec(),
+                        &get_compiler(),
+                        config,
+                    )
+                    .expect("WASM can't be compiled");
+                    println!("D");
+                    let i = panic::catch_unwind(AssertUnwindSafe(|| {
+                        module.instantiate(&spectest_import_object)
+                    }));
+                    println!("E");
+                    match i {
+                        Err(_) | Ok(Err(_)) => test_report.count_passed(),
+                        Ok(_) => {
+                            test_report.add_failure(
+                                SpecFailure {
+                                    file: filename.to_string(),
+                                    line: line,
+                                    kind: format!("{}", "AssertUninstantiable"),
+                                    message: format!(
+                                        "instantiate successful, expected uninstantiable"
+                                    ),
+                                },
+                                &test_key,
+                                excludes,
+                            );
+                        }
+                    };
+                    println!("F");
+                }
                 CommandKind::AssertExhaustion { action, message: _ } => {
                     match action {
                         Action::Invoke {