fix wasm test

Signed-off-by: chaoqin-li1123 <[email protected]>

Author: chaoqin-li1123

src/wavm/wavm.cc

@@ -397,8 +397,10 @@ void getFunctionWavm(WasmVm *vm, std::string_view function_name,
     return;
   }
   if (!checkFunctionType(f, inferStdFunctionType(function))) {
+    *function = nullptr;
     wavm->fail(FailState::UnableToInitializeCode,
                "Bad function signature for: " + std::string(function_name));
+    return;
   }
   *function = [wavm, f, function_name](ContextBase *context, Args... args) -> R {
     WasmUntaggedValue values[] = {args...};
@@ -427,8 +429,10 @@ void getFunctionWavm(WasmVm *vm, std::string_view function_name,
     return;
   }
   if (!checkFunctionType(f, inferStdFunctionType(function))) {
+    *function = nullptr;
     wavm->fail(FailState::UnableToInitializeCode,
                "Bad function signature for: " + std::string(function_name));
+    return;
   }
   *function = [wavm, f, function_name](ContextBase *context, Args... args) {
     WasmUntaggedValue values[] = {args...};

test/BUILD

@@ -131,6 +131,8 @@ cc_library(
     hdrs = ["utility.h"],
     deps = [
         "//:lib",
+        "//:wasmtime_lib",
+        "//:wavm_lib",
         "@com_google_googletest//:gtest",
     ],
 )

test/runtime_test.cc

@@ -145,6 +145,9 @@ TEST_P(TestVM, BadExportFunction) {
   vm_->registerCallback(
       "env", "callback", &callback,
       &ConvertFunctionWordToUint32<decltype(callback), callback>::convertFunctionWordToUint32);
+  vm_->registerCallback(
+      "env", "callback2", &callback2,
+      &ConvertFunctionWordToUint32<decltype(callback2), callback2>::convertFunctionWordToUint32);
   ASSERT_TRUE(vm_->link(""));
 
   WasmCallVoid<0> run;

test/wasm_test.cc

@@ -142,10 +142,11 @@ TEST_P(TestVM, DifferentRootContextsFromDifferentPluginKeys) {
   // Read the minimal loadable binary.
   std::string source = readTestWasmFile("abi_export.wasm");
 
+  const std::string vm_key = "vm_key";
   // Create base Wasm via createWasm.
   std::shared_ptr<WasmHandleBase> base_wasm_handle =
-      createWasm("vm_key", source, plugin1, wasm_handle_factory, wasm_handle_clone_factory, false);
-  EXPECT_TRUE(getThreadLocalWasm(vm_id) == base_wasm_handle);
+      createWasm(vm_key, source, plugin1, wasm_handle_factory, wasm_handle_clone_factory, false);
+  base_wasm_handle->wasm()->start(plugin1);
   ContextBase *root_context1 = base_wasm_handle->wasm()->getRootContext(plugin1, false);
   EXPECT_TRUE(root_context1 != nullptr);
 
@@ -155,7 +156,7 @@ TEST_P(TestVM, DifferentRootContextsFromDifferentPluginKeys) {
   EXPECT_TRUE(base_wasm_handle->wasm()->getRootContext(plugin2, false) == nullptr);
 
   // Create context from a plugin2.
-  base_wasm_handle->wasm()->createContext(plugin2);
+  base_wasm_handle->wasm()->start(plugin2);
   ContextBase *root_context2 = base_wasm_handle->wasm()->getRootContext(plugin2, false);
   EXPECT_TRUE(root_context2 != nullptr);