fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-25 22:51:32 +00:00
Code Issues Projects Releases Wiki Activity

Re-use registered module instances in spectests

Browse Source
This commit is contained in:
Brandon Fish
2019-08-10 15:56:25 -06:00
parent 1f8f810222
commit 228d562a3b
3 changed files with 54 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/runtime-core/src/instance.rs
View File

@ -500,6 +500,23 @@ impl LikeNamespace for Instance {
} }
} }
use std::rc::Rc;
impl LikeNamespace for Rc<Instance> {
fn get_export(&self, name: &str) -> Option<Export> {
let export_index = self.module.info.exports.get(name)?;
Some(self.inner.get_export_from_index(&self.module, export_index))
}
fn get_exports(&self) -> Vec<(String, Export)> {
unimplemented!("Use the exports method instead");
}
fn maybe_insert(&mut self, _name: &str, _export: Export) -> Option<()> {
None
}
}
#[must_use] #[must_use]
fn call_func_with_index( fn call_func_with_index(
info: &ModuleInfo, info: &ModuleInfo,

79
lib/spectests/tests/excludes.txt
View File

@ -22,30 +22,19 @@ clif:skip:names.wast:* # Names file has parsing error?
clif:skip:simd.wast:* # SIMD not implemented clif:skip:simd.wast:* # SIMD not implemented
clif:skip:simd_binaryen.wast:* # SIMD not implemented clif:skip:simd_binaryen.wast:* # SIMD not implemented
clif:fail:elem.wast:366 # AssertReturn - Call failed RuntimeError: WebAssembly trap occurred during runtime: `call_indirect` out-of-bounds
clif:fail:elem.wast:367 # AssertReturn - result I32(65) ("0x41") does not match expected I32(68) ("0x44")
clif:fail:elem.wast:379 # AssertReturn - Call failed RuntimeError: WebAssembly trap occurred during runtime: `call_indirect` out-of-bounds
clif:fail:elem.wast:380 # AssertReturn - result I32(65) ("0x41") does not match expected I32(69) ("0x45")
clif:fail:elem.wast:381 # AssertReturn - result I32(66) ("0x42") does not match expected I32(70) ("0x46")
clif:fail:globals.wast:243 # AssertInvalid - Should be invalid clif:fail:globals.wast:243 # AssertInvalid - Should be invalid
clif:fail:linking.wast:81 # AssertReturn Get - Expected Global I32(241) got: I32(142) clif:fail:linking.wast:137 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108837062 - illegal instruction"
clif:fail:linking.wast:83 # AssertReturn - result I32(142) ("0x8e") does not match expected I32(241) ("0xf1") clif:fail:linking.wast:139 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108837062 - illegal instruction"
clif:fail:linking.wast:137 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108b99062 - illegal instruction" clif:fail:linking.wast:142 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108837062 - illegal instruction"
clif:fail:linking.wast:139 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108b99062 - illegal instruction" clif:fail:linking.wast:144 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108837062 - illegal instruction"
clif:fail:linking.wast:142 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108b99062 - illegal instruction" clif:fail:linking.wast:147 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108837037 - illegal instruction"
clif:fail:linking.wast:144 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108b99062 - illegal instruction" clif:fail:linking.wast:149 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108837037 - illegal instruction"
clif:fail:linking.wast:147 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108b99037 - illegal instruction" clif:fail:linking.wast:185 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108837062 - illegal instruction"
clif:fail:linking.wast:149 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108b99037 - illegal instruction" clif:fail:linking.wast:187 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108837062 - illegal instruction"
clif:fail:linking.wast:172 # AssertReturn - result I32(4) ("0x4") does not match expected I32(-4) ("0xfffffffc") clif:fail:linking.wast:236 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x10883d000 - segmentation violation"
clif:fail:linking.wast:173 # AssertReturn - result I32(4) ("0x4") does not match expected I32(-4) ("0xfffffffc") clif:fail:linking.wast:248 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x10883d000 - segmentation violation"
clif:fail:linking.wast:175 # AssertReturn - result I32(4) ("0x4") does not match expected I32(-4) ("0xfffffffc") clif:fail:linking.wast:342 # AssertReturn - result I32(97) ("0x61") does not match expected I32(0) ("0x0")
clif:fail:linking.wast:178 # AssertReturn - Call failed RuntimeError: WebAssembly trap occurred during runtime: `call_indirect` out-of-bounds clif:fail:linking.wast:354 # AssertReturn - result I32(97) ("0x61") does not match expected I32(0) ("0x0")
clif:fail:linking.wast:179 # AssertReturn - Call failed RuntimeError: "unknown trap at 0x108b99062 - illegal instruction"
clif:fail:linking.wast:181 # AssertReturn - Call failed RuntimeError: "unknown trap at 0x108b99062 - illegal instruction"
clif:fail:linking.wast:185 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108b99062 - illegal instruction"
clif:fail:linking.wast:187 # AssertTrap - expected trap, got Runtime:Error "unknown trap at 0x108b99062 - illegal instruction"
clif:fail:linking.wast:288 # AssertReturn - result I32(2) ("0x2") does not match expected I32(167) ("0xa7")
clif:fail:linking.wast:289 # AssertReturn - result I32(2) ("0x2") does not match expected I32(167) ("0xa7")
clif:fail:linking.wast:387 # AssertReturn - result I32(0) ("0x0") does not match expected I32(104) ("0x68") 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:fail:linking.wast:388 # AssertReturn - Call failed RuntimeError: WebAssembly trap occurred during runtime: `call_indirect` out-of-bounds
@ -839,6 +828,8 @@ llvm:skip:call_indirect.wast:556 # Spec running forever
llvm:skip:call_indirect.wast:557 # Spec running forever llvm:skip:call_indirect.wast:557 # Spec running forever
llvm:skip:fac.wast:89 # Spec running forever llvm:skip:fac.wast:89 # Spec running forever
llvm:skip:skip-stack-guard-page.wast:* # Spec running forever or (signal: 4, SIGILL: illegal instruction) llvm:skip:skip-stack-guard-page.wast:* # Spec running forever or (signal: 4, SIGILL: illegal instruction)
llvm:skip:linking.wast:236 # terminating with uncaught exception of type WasmTrap
llvm:skip:linking.wast:248 # terminating with uncaught exception of type WasmTrap
llvm:fail:binary-leb128.wast:56 # Module - caught panic Any llvm:fail:binary-leb128.wast:56 # Module - caught panic Any
llvm:fail:binary-leb128.wast:65 # Module - caught panic Any llvm:fail:binary-leb128.wast:65 # Module - caught panic Any
@ -846,16 +837,11 @@ llvm:fail:binary-leb128.wast:74 # Module - caught panic Any
llvm:fail:binary-leb128.wast:86 # Module - caught panic Any llvm:fail:binary-leb128.wast:86 # Module - caught panic Any
llvm:fail:binary-leb128.wast:98 # Module - caught panic Any llvm:fail:binary-leb128.wast:98 # Module - caught panic Any
llvm:fail:binary.wast:446 # Module - caught panic Any llvm:fail:binary.wast:446 # Module - caught panic Any
llvm:fail:elem.wast:366 # AssertReturn - Call failed RuntimeError: WebAssembly trap occurred during runtime: incorrect `call_indirect` signature
llvm:fail:elem.wast:367 # AssertReturn - result I32(65) ("0x41") does not match expected I32(68) ("0x44")
llvm:fail:elem.wast:379 # AssertReturn - Call failed RuntimeError: WebAssembly trap occurred during runtime: incorrect `call_indirect` signature
llvm:fail:elem.wast:380 # AssertReturn - result I32(65) ("0x41") does not match expected I32(69) ("0x45")
llvm:fail:elem.wast:381 # AssertReturn - result I32(66) ("0x42") does not match expected I32(70) ("0x46")
llvm:fail:globals.wast:243 # AssertInvalid - caught panic Any llvm:fail:globals.wast:243 # AssertInvalid - caught panic Any
llvm:fail:i32.wast:243 # AssertReturn - result I32(278753615) ("0x109d714f") does not match expected I32(32) ("0x20") llvm:fail:i32.wast:243 # AssertReturn - result I32(115568975) ("0x6e3714f") does not match expected I32(32) ("0x20")
llvm:fail:i32.wast:252 # AssertReturn - result I32(278753632) ("0x109d7160") does not match expected I32(32) ("0x20") llvm:fail:i32.wast:252 # AssertReturn - result I32(115568992) ("0x6e37160") does not match expected I32(32) ("0x20")
llvm:fail:i64.wast:243 # AssertReturn - result I64(4573721071) ("0x1109d71ef") does not match expected I64(64) ("0x40") llvm:fail:i64.wast:243 # AssertReturn - result I64(4410536431) ("0x106e371ef") does not match expected I64(64) ("0x40")
llvm:fail:i64.wast:252 # AssertReturn - result I64(4573721056) ("0x1109d71e0") does not match expected I64(64) ("0x40") llvm:fail:i64.wast:252 # AssertReturn - result I64(4410536416) ("0x106e371e0") does not match expected I64(64) ("0x40")
llvm:fail:imports.wast:98 # Module - caught panic Any llvm:fail:imports.wast:98 # Module - caught panic Any
llvm:fail:imports.wast:99 # Module - caught panic Any llvm:fail:imports.wast:99 # Module - caught panic Any
llvm:fail:imports.wast:100 # Module - caught panic Any llvm:fail:imports.wast:100 # Module - caught panic Any
@ -897,16 +883,6 @@ llvm:fail:linking.wast:22 # Module - caught panic Any
llvm:fail:linking.wast:26 # Register - No instance available llvm:fail:linking.wast:26 # Register - No instance available
llvm:fail:linking.wast:28 # AssertUnlinkable - caught panic Any llvm:fail:linking.wast:28 # AssertUnlinkable - caught panic Any
llvm:fail:linking.wast:32 # AssertUnlinkable - caught panic Any llvm:fail:linking.wast:32 # AssertUnlinkable - caught panic Any
llvm:fail:linking.wast:81 # AssertReturn Get - Expected Global I32(241) got: I32(142)
llvm:fail:linking.wast:83 # AssertReturn - result I32(142) ("0x8e") does not match expected I32(241) ("0xf1")
llvm:fail:linking.wast:172 # AssertReturn - result I32(4) ("0x4") does not match expected I32(-4) ("0xfffffffc")
llvm:fail:linking.wast:173 # AssertReturn - result I32(4) ("0x4") does not match expected I32(-4) ("0xfffffffc")
llvm:fail:linking.wast:175 # AssertReturn - result I32(4) ("0x4") does not match expected I32(-4) ("0xfffffffc")
llvm:fail:linking.wast:178 # AssertReturn - Call failed RuntimeError: WebAssembly trap occurred during runtime: incorrect `call_indirect` signature
llvm:fail:linking.wast:179 # AssertReturn - Call failed RuntimeError: WebAssembly trap occurred during runtime: incorrect `call_indirect` signature
llvm:fail:linking.wast:181 # AssertReturn - Call failed RuntimeError: WebAssembly trap occurred during runtime: incorrect `call_indirect` signature
llvm:fail:linking.wast:288 # AssertReturn - result I32(2) ("0x2") does not match expected I32(167) ("0xa7")
llvm:fail:linking.wast:289 # AssertReturn - result I32(2) ("0x2") does not match expected I32(167) ("0xa7")
llvm:fail:linking.wast:314 # AssertReturn - No instance available: Some("$Pm") llvm:fail:linking.wast:314 # AssertReturn - No instance available: Some("$Pm")
llvm:fail:linking.wast:315 # AssertReturn - No instance available: Some("$Pm") llvm:fail:linking.wast:315 # AssertReturn - No instance available: Some("$Pm")
llvm:fail:linking.wast:316 # AssertReturn - No instance available: Some("$Pm") llvm:fail:linking.wast:316 # AssertReturn - No instance available: Some("$Pm")
@ -916,13 +892,14 @@ llvm:fail:linking.wast:319 # AssertReturn - No instance available: Some("$Pm")
llvm:fail:linking.wast:320 # AssertReturn - No instance available: Some("$Pm") llvm:fail:linking.wast:320 # AssertReturn - No instance available: Some("$Pm")
llvm:fail:linking.wast:321 # AssertReturn - No instance available: Some("$Pm") llvm:fail:linking.wast:321 # AssertReturn - No instance available: Some("$Pm")
llvm:fail:linking.wast:324 # AssertUnlinkable - caught panic Any llvm:fail:linking.wast:324 # AssertUnlinkable - caught panic Any
llvm:fail:linking.wast:342 # AssertReturn - result I32(97) ("0x61") does not match expected I32(0) ("0x0")
llvm:fail:linking.wast:354 # AssertReturn - result I32(97) ("0x61") does not match expected I32(0) ("0x0")
llvm:fail:linking.wast:387 # AssertReturn - result I32(0) ("0x0") does not match expected I32(104) ("0x68") 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:fail:linking.wast:388 # AssertReturn - Call failed RuntimeError: WebAssembly trap occurred during runtime: incorrect `call_indirect` signature
llvm:fail:load.wast:201 # AssertReturn - result I32(327991327) ("0x138cc01f") does not match expected I32(32) ("0x20") llvm:fail:load.wast:201 # AssertReturn - result I32(118083615) ("0x709d01f") does not match expected I32(32) ("0x20")
llvm:fail:start.wast:92 # Module - caught panic Any llvm:fail:start.wast:92 # Module - caught panic Any
llvm:fail:type.wast:3 # Module - caught panic Any llvm:fail:type.wast:3 # Module - caught panic Any
# LLVM Windows # LLVM Windows
llvm:skip:address.wast:*:windows llvm:skip:address.wast:*:windows
llvm:skip:align.wast:*:windows llvm:skip:align.wast:*:windows
@ -1151,11 +1128,6 @@ singlepass:fail:elem.wast:106 # Module - caught panic Any
singlepass:fail:elem.wast:111 # Module - caught panic Any singlepass:fail:elem.wast:111 # Module - caught panic Any
singlepass:fail:elem.wast:170 # AssertUnlinkable - caught panic Any singlepass:fail:elem.wast:170 # AssertUnlinkable - caught panic Any
singlepass:fail:elem.wast:353 # AssertTrap - expected trap, got Runtime:Error unknown error singlepass:fail:elem.wast:353 # AssertTrap - expected trap, got Runtime:Error unknown error
singlepass:fail:elem.wast:366 # AssertReturn - Call failed RuntimeError: unknown error
singlepass:fail:elem.wast:367 # AssertReturn - result I32(65) ("0x41") does not match expected I32(68) ("0x44")
singlepass:fail:elem.wast:379 # AssertReturn - Call failed RuntimeError: unknown error
singlepass:fail:elem.wast:380 # AssertReturn - result I32(65) ("0x41") does not match expected I32(69) ("0x45")
singlepass:fail:elem.wast:381 # AssertReturn - result I32(66) ("0x42") does not match expected I32(70) ("0x46")
singlepass:fail:exports.wast:24 # Module - caught panic Any singlepass:fail:exports.wast:24 # Module - caught panic Any
singlepass:fail:exports.wast:25 # Module - caught panic Any singlepass:fail:exports.wast:25 # Module - caught panic Any
singlepass:fail:exports.wast:56 # Module - caught panic Any singlepass:fail:exports.wast:56 # Module - caught panic Any
@ -1780,8 +1752,6 @@ singlepass:fail:linking.wast:22 # Module - caught panic Any
singlepass:fail:linking.wast:26 # Register - No instance available singlepass:fail:linking.wast:26 # Register - No instance available
singlepass:fail:linking.wast:28 # AssertUnlinkable - caught panic Any singlepass:fail:linking.wast:28 # AssertUnlinkable - caught panic Any
singlepass:fail:linking.wast:32 # AssertUnlinkable - caught panic Any singlepass:fail:linking.wast:32 # AssertUnlinkable - caught panic Any
singlepass:fail:linking.wast:81 # AssertReturn Get - Expected Global I32(241) got: I32(142)
singlepass:fail:linking.wast:83 # AssertReturn - result I32(142) ("0x8e") does not match expected I32(241) ("0xf1")
singlepass:fail:linking.wast:87 # AssertUnlinkable - caught panic Any singlepass:fail:linking.wast:87 # AssertUnlinkable - caught panic Any
singlepass:fail:linking.wast:91 # AssertUnlinkable - caught panic Any singlepass:fail:linking.wast:91 # AssertUnlinkable - caught panic Any
singlepass:fail:linking.wast:134 # AssertReturn - Call failed RuntimeError: unknown error singlepass:fail:linking.wast:134 # AssertReturn - Call failed RuntimeError: unknown error
@ -1797,11 +1767,7 @@ singlepass:fail:linking.wast:148 # AssertTrap - expected trap, got Runtime:Error
singlepass:fail:linking.wast:149 # AssertTrap - expected trap, got Runtime:Error unknown error singlepass:fail:linking.wast:149 # AssertTrap - expected trap, got Runtime:Error unknown error
singlepass:fail:linking.wast:152 # AssertTrap - expected trap, got Runtime:Error unknown error singlepass:fail:linking.wast:152 # AssertTrap - expected trap, got Runtime:Error unknown error
singlepass:fail:linking.wast:169 # AssertReturn - Call failed RuntimeError: unknown error singlepass:fail:linking.wast:169 # AssertReturn - Call failed RuntimeError: unknown error
singlepass:fail:linking.wast:172 # AssertReturn - result I32(4) ("0x4") does not match expected I32(-4) ("0xfffffffc")
singlepass:fail:linking.wast:173 # AssertReturn - result I32(4) ("0x4") does not match expected I32(-4) ("0xfffffffc")
singlepass:fail:linking.wast:175 # AssertReturn - Call failed RuntimeError: unknown error singlepass:fail:linking.wast:175 # AssertReturn - Call failed RuntimeError: unknown error
singlepass:fail:linking.wast:178 # AssertReturn - Call failed RuntimeError: unknown error
singlepass:fail:linking.wast:179 # AssertReturn - Call failed RuntimeError: unknown error
singlepass:fail:linking.wast:181 # AssertReturn - Call failed RuntimeError: unknown error singlepass:fail:linking.wast:181 # AssertReturn - Call failed RuntimeError: unknown error
singlepass:fail:linking.wast:184 # AssertTrap - expected trap, got Runtime:Error unknown error singlepass:fail:linking.wast:184 # AssertTrap - expected trap, got Runtime:Error unknown error
singlepass:fail:linking.wast:185 # AssertTrap - expected trap, got Runtime:Error unknown error singlepass:fail:linking.wast:185 # AssertTrap - expected trap, got Runtime:Error unknown error
@ -1815,12 +1781,11 @@ singlepass:fail:linking.wast:204 # AssertReturn Get - No instance available Some
singlepass:fail:linking.wast:225 # AssertTrap - expected trap, got Runtime:Error unknown 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: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:248 # AssertTrap - expected trap, got Runtime:Error unknown error
singlepass:fail:linking.wast:288 # AssertReturn - result I32(2) ("0x2") does not match expected I32(167) ("0xa7")
singlepass:fail:linking.wast:289 # AssertReturn - result I32(2) ("0x2") does not match expected I32(167) ("0xa7")
singlepass:fail:linking.wast:293 # Module - caught panic Any singlepass:fail:linking.wast:293 # Module - caught panic Any
singlepass:fail:linking.wast:299 # AssertUnlinkable - caught panic Any singlepass:fail:linking.wast:299 # AssertUnlinkable - caught panic Any
singlepass:fail:linking.wast:324 # AssertUnlinkable - caught panic Any singlepass:fail:linking.wast:324 # AssertUnlinkable - caught panic Any
singlepass:fail:linking.wast:335 # AssertUnlinkable - caught panic Any singlepass:fail:linking.wast:335 # AssertUnlinkable - caught panic Any
singlepass:fail:linking.wast:354 # AssertReturn - result I32(97) ("0x61") does not match expected I32(0) ("0x0")
singlepass:fail:linking.wast:387 # AssertReturn - result I32(0) ("0x0") does not match expected I32(104) ("0x68") 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:linking.wast:388 # AssertReturn - Call failed RuntimeError: unknown error
singlepass:fail:load.wast:201 # AssertReturn - result I32(0) ("0x0") does not match expected I32(32) ("0x20") singlepass:fail:load.wast:201 # AssertReturn - result I32(0) ("0x0") does not match expected I32(32) ("0x20")

30
lib/spectests/tests/spectest.rs
View File

@ -18,6 +18,8 @@ mod tests {
// TODO Files could be run with multiple threads // TODO Files could be run with multiple threads
// TODO Allow running WAST &str directly (E.g. for use outside of spectests) // TODO Allow running WAST &str directly (E.g. for use outside of spectests)
use std::rc::Rc;
struct SpecFailure { struct SpecFailure {
file: String, file: String,
line: u64, line: u64,
@ -135,7 +137,6 @@ mod tests {
table::Table, table::Table,
types::{ElementType, MemoryDescriptor, TableDescriptor}, types::{ElementType, MemoryDescriptor, TableDescriptor},
units::Pages, units::Pages,
Module,
}; };
use wasmer_runtime_core::{func, imports, vm::Ctx}; use wasmer_runtime_core::{func, imports, vm::Ctx};
@ -172,11 +173,10 @@ mod tests {
use std::panic; use std::panic;
let mut instance: Option<Rc<Instance>> = None; let mut instance: Option<Rc<Instance>> = None;
use std::rc::Rc;
let mut named_modules: HashMap<String, Rc<Instance>> = HashMap::new(); let mut named_modules: HashMap<String, Rc<Instance>> = HashMap::new();
let mut registered_modules: HashMap<String, Module> = HashMap::new(); let mut registered_modules: HashMap<String, Rc<Instance>> = HashMap::new();
// //
while let Some(Command { kind, line }) = while let Some(Command { kind, line }) =
@ -859,20 +859,23 @@ mod tests {
} }
} }
CommandKind::Register { name, as_name } => { CommandKind::Register { name, as_name } => {
let instance: Option<&Instance> = match name { let instance: Option<Rc<Instance>> = match name {
Some(ref name) => { Some(ref name) => {
let i = named_modules.get(name); let i = named_modules.get(name);
match i { match i {
Some(ins) => Some(ins.borrow()), Some(ins) => Some(Rc::clone(ins)),
None => None, None => None,
} }
} }
None => match instance { None => match instance {
Some(ref i) => Some(i.borrow()), Some(ref i) => Some(Rc::clone(i)),
None => None, None => None,
}, },
}; };
if instance.is_none() {
if let Some(ins) = instance {
registered_modules.insert(as_name, ins);
} else {
test_report.add_failure( test_report.add_failure(
SpecFailure { SpecFailure {
file: filename.to_string(), file: filename.to_string(),
@ -883,8 +886,6 @@ mod tests {
&test_key, &test_key,
excludes, excludes,
); );
} else {
registered_modules.insert(as_name, instance.unwrap().module());
} }
} }
CommandKind::PerformAction(ref action) => match action { CommandKind::PerformAction(ref action) => match action {
@ -1011,7 +1012,9 @@ mod tests {
println!("{} {}", val, val2); println!("{} {}", val, val2);
} }
fn get_spectest_import_object(registered_modules: &HashMap<String, Module>) -> ImportObject { fn get_spectest_import_object(
registered_modules: &HashMap<String, Rc<Instance>>,
) -> ImportObject {
let memory = Memory::new(MemoryDescriptor { let memory = Memory::new(MemoryDescriptor {
minimum: Pages(1), minimum: Pages(1),
maximum: Some(Pages(2)), maximum: Some(Pages(2)),
@ -1046,11 +1049,8 @@ mod tests {
}, },
}; };
for (name, module) in registered_modules.iter() { for (name, instance) in registered_modules.iter() {
let i = module import_object.register(name.clone(), Rc::clone(instance));
.instantiate(&import_object)
.expect("Registered WASM can't be instantiated");
import_object.register(name.clone(), i);
} }
import_object import_object
} }