Fix failures on test compilation.

This commit is contained in:
losfair
2020-02-11 03:03:05 +08:00
parent e17d8f20b8
commit b40edd4512
3 changed files with 10 additions and 9 deletions

View File

@ -71,13 +71,17 @@ pub fn call_protected(
TrapCode::HeapOutOfBounds => ExceptionCode::MemoryOutOfBounds,
TrapCode::TableOutOfBounds => ExceptionCode::CallIndirectOOB,
TrapCode::UnreachableCodeReached => ExceptionCode::Unreachable,
_ => ExceptionCode::Unknown,
_ => return Err(CallProtError(Box::new("unknown trap code".to_string()))),
},
EXCEPTION_STACK_OVERFLOW => ExceptionCode::Unknown,
EXCEPTION_STACK_OVERFLOW => ExceptionCode::MemoryOutOfBounds,
EXCEPTION_INT_DIVIDE_BY_ZERO | EXCEPTION_INT_OVERFLOW => {
ExceptionCode::IllegalArithmetic
}
_ => ExceptionCode::Unknown,
_ => {
return Err(CallProtError(Box::new(
"unknown exception code".to_string(),
)))
}
})))
} else {
let signal = match code as DWORD {

View File

@ -30,10 +30,8 @@ mod tests {
match result {
Err(err) => match err {
CallError::Runtime(RuntimeError(e)) => {
let exc_code = e
.downcast::<ExceptionCode>()
e.downcast::<ExceptionCode>()
.expect("expecting exception code");
assert!(exc_code != ExceptionCode::Unknown);
}
_ => unimplemented!(),
},

View File

@ -690,7 +690,7 @@ mod tests {
}
CallError::Runtime(RuntimeError(e)) => {
use wasmer_runtime::ExceptionCode;
if let Some(_) = data.downcast_ref::<ExceptionCode>() {
if let Some(_) = e.downcast_ref::<ExceptionCode>() {
test_report.count_passed();
} else {
test_report.add_failure(
@ -699,8 +699,7 @@ mod tests {
line,
kind: format!("{}", "AssertTrap"),
message: format!(
"expected trap, got Runtime:Error {:?}",
r
"expected trap, got RuntimeError"
),
},
&test_key,