mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-10 22:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
Felix Schütt
2022-09-26 10:22:56 +02:00
parent 35d41e75cf
commit 449a77fb6b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/c-api/examples/wasmer-capi-examples-runner/src/lib.rs
View File

@@ -189,13 +189,11 @@ fn test_run() {
}; };
for test in TESTS.iter() { for test in TESTS.iter() {
let mut manifest_dir_parent = std::path::Path::new(&manifest_dir); let mut manifest_dir_parent = std::path::Path::new(&manifest_dir);
let mut manifest_dir_parent = manifest_dir_parent.parent().unwrap(); let mut manifest_dir_parent = manifest_dir_parent.parent().unwrap();
let c_file_path = manifest_dir_parent.join(&format!("{test}.c")); let c_file_path = manifest_dir_parent.join(&format!("{test}.c"));
if target.contains("msvc") {
if target.contains("msvc") {
let mut build = cc::Build::new(); let mut build = cc::Build::new();
let mut build = build let mut build = build
.cargo_metadata(false) .cargo_metadata(false)
@@ -227,7 +225,7 @@ fn test_run() {
.expect(&format!("failed to fix symlinks: {log}")); .expect(&format!("failed to fix symlinks: {log}"));
println!("{log}"); println!("{log}");
} }
let exe_outpath = manifest_dir_parent.join(&format!("{test}.exe")); let exe_outpath = manifest_dir_parent.join(&format!("{test}.exe"));
let exe_outpath = format!("{}", exe_outpath.display()); let exe_outpath = format!("{}", exe_outpath.display());
println!("compiling exe to {exe_outpath}"); println!("compiling exe to {exe_outpath}");
@@ -251,7 +249,7 @@ fn test_run() {
let batch_formatted = format!("{}\\", vcvars_bat_path_parent.display()); let batch_formatted = format!("{}\\", vcvars_bat_path_parent.display());
let vcvars_bat_file = vcvars_bat_file let vcvars_bat_file = vcvars_bat_file
.replace("%~dp0", &batch_formatted.replace("\\", "\\\\")) .replace("%~dp0", &batch_formatted.replace("\\", "\\\\"))
.replace("\"%1\"", "\"x64\""); .replace("\"%1\"", "\"x64\"");
let vcvars_modified = format!("{vcvars_bat_file}\r\n{command:?}"); let vcvars_modified = format!("{vcvars_bat_file}\r\n{command:?}");
let path = std::path::Path::new(&manifest_dir).join("compile-windows.bat"); let path = std::path::Path::new(&manifest_dir).join("compile-windows.bat");
println!("outputting batch to {}", path.display()); println!("outputting batch to {}", path.display());
@@ -276,11 +274,14 @@ fn test_run() {
print_wasmer_root_to_stdout(&config); print_wasmer_root_to_stdout(&config);
panic!("failed to compile {test}"); panic!("failed to compile {test}");
} }
if !std::path::Path::new(&exe_outpath).exists() { if !std::path::Path::new(&exe_outpath).exists() {
panic!("error: {exe_outpath} does not exist"); panic!("error: {exe_outpath} does not exist");
} }
if !std::path::Path::new(&wasmer_dll_dir).join("wasmer.dll").exists() { if !std::path::Path::new(&wasmer_dll_dir)
.join("wasmer.dll")
.exists()
{
panic!("error: {wasmer_dll_dir} has no wasmer.dll"); panic!("error: {wasmer_dll_dir} has no wasmer.dll");
} }
// execute // execute

1
lib/c-api/tests/wasmer-c-api-test-runner/src/lib.rs
View File

@@ -24,7 +24,6 @@ impl Config {
println!("manifest dir = {manifest_dir}, wasmer root dir = {wasmer_base_dir}"); println!("manifest dir = {manifest_dir}, wasmer root dir = {wasmer_base_dir}");
config.wasmer_dir = wasmer_base_dir.clone() + "/package"; config.wasmer_dir = wasmer_base_dir.clone() + "/package";
if !std::path::Path::new(&config.wasmer_dir).exists() { if !std::path::Path::new(&config.wasmer_dir).exists() {
println!("running make build-capi..."); println!("running make build-capi...");
// run make build-capi // run make build-capi
let mut cmd = std::process::Command::new("make"); let mut cmd = std::process::Command::new("make");