fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-12 16:41:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into c-api-extract-instance_context-from-instance

Browse Source
This commit is contained in:
Yaron Wittenstein
2019-08-01 14:08:47 +03:00
parent 3a84288fd9 93032c7360
commit 09d704d053
34 changed files with 390 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/runtime-c-api/Cargo.toml
View File

@ -12,7 +12,7 @@ readme = "README.md"
crate-type = ["cdylib", "rlib", "staticlib"]
[dependencies]
libc = "0.2"
libc = "0.2.60"
[dependencies.wasmer-runtime]
path = "../runtime"
@ -27,4 +27,4 @@ debug = ["wasmer-runtime/debug"]
llvm = ["wasmer-runtime/llvm"]
[build-dependencies]
cbindgen = "0.8"
cbindgen = "0.9.0"

14
lib/runtime-c-api/tests/runtime_c_api_tests.rs
View File

@ -4,19 +4,17 @@ use std::process::Command;
fn test_c_api() {
let project_tests_dir = concat!(env!("CARGO_MANIFEST_DIR"), "/tests");
run_command("cmake", project_tests_dir, Some("."));
run_command("make", project_tests_dir, Some("-Wdev -Werror=dev"));
run_command("make", project_tests_dir, Some("test"));
run_command("cmake", project_tests_dir, vec!["."]);
run_command("make", project_tests_dir, vec!["-Wdev", "-Werror=dev"]);
run_command("make", project_tests_dir, vec!["test", "ARGS=\"-V\""]);
}
fn run_command(command_str: &str, dir: &str, arg: Option<&str>) {
println!("Running command: `{}` arg: {:?}", command_str, arg);
fn run_command(command_str: &str, dir: &str, args: Vec<&str>) {
println!("Running command: `{}` args: {:?}", command_str, args);
let mut command = Command::new(command_str);
if let Some(a) = arg {
command.arg(a);
}
command.args(&args);
command.current_dir(dir);

3
lib/runtime-c-api/tests/test-exported-memory.c
View File

@ -42,8 +42,9 @@ int main()
assert(export_length == 5);
// Get the `memory` export.
wasmer_export_t *export = wasmer_exports_get(exports, 1);
wasmer_export_t *export = wasmer_exports_get(exports, 0);
wasmer_import_export_kind kind = wasmer_export_kind(export);
printf("Wasmer import export kind: %d (Memory is %d)\n", kind, WASM_MEMORY);
assert(kind == WASM_MEMORY);
wasmer_byte_array export_name = wasmer_export_name(export);