Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DO NOT MERGE. DO NOT REVIEW. #888

Closed
wants to merge 5 commits into from
Closed

DO NOT MERGE. DO NOT REVIEW. #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84f2148
DO NOT MERGE.
nlewycky Oct 17, 2019
555586e
Try removing tail of AssertUninstantiable implementation.
nlewycky Oct 17, 2019
94fb176
Wrap the module instantiation in a panic-trap, like `Module` does.
nlewycky Oct 18, 2019
5a48114
What if we just skip that one assert_trap on windows+clif?
nlewycky Oct 18, 2019
2a3b0da
Fix syntax error.
nlewycky Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions lib/spectests/tests/excludes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -83,6 +82,7 @@ clif:fail:data.wast:227:windows # AssertUnlinkable - caught panic Any
clif:fail:data.wast:258:windows # AssertUnlinkable - caught panic Any
clif:fail:data.wast:273:windows # AssertUnlinkable - caught panic Any
clif:fail:start.wast:92:windows # Module - caught panic Any
clif:skip:start.wast:98:windows

clif:fail:align.wast:3:windows # Module - caught panic Any
clif:fail:align.wast:4:windows # Module - caught panic Any
Expand Down Expand Up @@ -269,7 +269,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
Expand Down Expand Up @@ -957,7 +956,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
Expand Down
44 changes: 40 additions & 4 deletions lib/spectests/tests/spectest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,10 +720,46 @@ 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 = module.instantiate(&spectest_import_object);
println!("E");
match i {
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 {
Expand Down