Merge branch 'master' into freebsd

This commit is contained in:
Mark McCaskey
2020-03-16 12:53:10 -07:00
committed by GitHub
76 changed files with 2854 additions and 1188 deletions

View File

@ -1,6 +1,6 @@
[package]
name = "wasmer-spectests"
version = "0.14.1"
version = "0.16.2"
description = "Wasmer spectests library"
license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -9,10 +9,10 @@ edition = "2018"
[dependencies]
glob = "0.3"
wasmer-runtime = { path = "../runtime", version = "0.14.1", default-features = false}
wasmer-clif-backend = { path = "../clif-backend", version = "0.14.1", optional = true}
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.14.1", features = ["test"], optional = true }
wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.14.1", optional = true }
wasmer-runtime = { path = "../runtime", version = "0.16.2", default-features = false}
wasmer-clif-backend = { path = "../clif-backend", version = "0.16.2", optional = true}
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.2", features = ["test"], optional = true }
wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.2", optional = true }
[build-dependencies]
wabt = "0.9.1"

View File

@ -256,6 +256,16 @@ mod tests {
Memory, Table,
};
fn format_panic(e: &dyn std::any::Any) -> String {
if let Some(s) = e.downcast_ref::<&str>() {
format!("{}", s)
} else if let Some(s) = e.downcast_ref::<String>() {
format!("{}", s)
} else {
"(unknown)".into()
}
}
fn parse_and_run(
path: &PathBuf,
file_excludes: &HashSet<String>,
@ -342,7 +352,7 @@ mod tests {
file: filename.to_string(),
line: line,
kind: format!("{}", "Module"),
message: format!("caught panic {:?}", e),
message: format!("caught panic {}", format_panic(&e)),
},
&test_key,
excludes,
@ -798,7 +808,7 @@ mod tests {
file: filename.to_string(),
line: line,
kind: format!("{}", "AssertInvalid"),
message: format!("caught panic {:?}", p),
message: format!("caught panic {}", format_panic(&p)),
},
&test_key,
excludes,
@ -851,7 +861,7 @@ mod tests {
file: filename.to_string(),
line: line,
kind: format!("{}", "AssertMalformed"),
message: format!("caught panic {:?}", p),
message: format!("caught panic {}", format_panic(&p)),
},
&test_key,
excludes,
@ -975,7 +985,7 @@ mod tests {
file: filename.to_string(),
line: line,
kind: format!("{}", "AssertUnlinkable"),
message: format!("caught panic {:?}", e),
message: format!("caught panic {}", format_panic(&e)),
},
&test_key,
excludes,