test: convert test for a missing import from WAT to WASM format. (env…

…oyproxy#59) This is needed, since not all runtimes support WAT format. Signed-off-by: Piotr Sikora <[email protected]>
PiotrSikora · Apr 22, 2019 · a7687ea · a7687ea
1 parent ea56a23
commit a7687ea
Show file tree

Hide file tree

Showing 5 changed files with 7,251 additions and 22 deletions.
diff --git a/test/extensions/wasm/config_test.cc b/test/extensions/wasm/config_test.cc
@@ -89,25 +89,9 @@ TEST(WasmFactoryTest, MissingImport) {
   ASSERT_NE(factory, nullptr);
   envoy::config::wasm::v2::WasmConfig config;
   config.mutable_vm_config()->set_vm("envoy.wasm.vm.wavm");
-  config.mutable_vm_config()->mutable_code()->set_inline_string(
-      "(module\n"
-      "  (type $0 (func (param i32 i32 i32)))\n"
-      "  (type $1 (func))\n"
-      "  (import \"env\" \"missing\" (func $missing (param i32 i32 i32)))\n"
-      "  (export \"memory\" (memory $2))\n"
-      "  (export \"main\" (func $main))\n"
-      "  (memory $2 17)\n"
-      "  (data $2 (i32.const 1048576) \"Hello, world!\")\n"
-      ""
-      " (func $main (type $1)\n"
-      "   i32.const 1\n"
-      "   i32.const 1048576\n"
-      "   i32.const 13\n"
-      "   call $missing\n"
-      "   )\n"
-      " )");
+  config.mutable_vm_config()->mutable_code()->set_filename(TestEnvironment::substitute(
+      "{{ test_rundir }}/test/extensions/wasm/test_data/missing_cpp.wasm"));
   config.set_singleton(true);
-
   Upstream::MockClusterManager cluster_manager;
   Event::MockDispatcher dispatcher;
   ThreadLocal::MockInstance tls;
@@ -117,9 +101,9 @@ TEST(WasmFactoryTest, MissingImport) {
   Server::Configuration::WasmFactoryContextImpl context(cluster_manager, dispatcher, tls, *api,
                                                         scope);
   Server::WasmSharedPtr wasm;
-  EXPECT_THROW_WITH_MESSAGE(
-      wasm = factory->createWasm(config, context), Extensions::Common::Wasm::WasmException,
-      "Failed to load WASM module due to a missing import: env.missing func (i32, i32, i32)->()");
+  EXPECT_THROW_WITH_REGEX(wasm = factory->createWasm(config, context),
+                          Extensions::Common::Wasm::WasmException,
+                          "Failed to load WASM module due to a missing import: env._missing.*");
 }
 
 } // namespace Wasm

diff --git a/test/extensions/wasm/test_data/Makefile b/test/extensions/wasm/test_data/Makefile
@@ -1,6 +1,13 @@
 NO_CONTEXT = true
 
-all: logging_cpp.wasm logging_rust.wasm bad_signature_cpp.wasm segv_cpp.wasm emscripten_cpp.wasm asm2wasm_cpp.wasm stats_cpp.wasm
+all: logging_cpp.wasm logging_rust.wasm bad_signature_cpp.wasm segv_cpp.wasm emscripten_cpp.wasm asm2wasm_cpp.wasm stats_cpp.wasm missing_cpp.wasm
 
 include ../../../../api/wasm/cpp/Makefile.base_lite
 include ../../../../api/wasm/rust/Makefile.base
+
+missing_cpp.wasm missing_cpp.wat: missing_cpp.cc ${CPP_API}/proxy_wasm_intrinsics.h ${CPP_API}/proxy_wasm_intrinsics.js
+	em++ -s WASM=1 -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s LEGALIZE_JS_FFI=0 -s EMIT_EMSCRIPTEN_METADATA=1 --std=c++17 -O3 -g3 -DEMSCRIPTEN_PROTOBUF_LITE=1 -I${CPP_API} -I${CPP_API}/google/protobuf -I/usr/local/include --js-library ${CPP_API}/proxy_wasm_intrinsics.js missing_cpp.cc ${CPP_API}/proxy_wasm_intrinsics_lite.pb.cc ${CPP_API}/struct_lite.pb.cc ${CPP_CONTEXT_LIB} ${CPP_API}/libprotobuf-lite.bc -o missing_cpp.js
+	wavm-disas missing_cpp.wasm missing_cpp.wat
+	wavm-compile missing_cpp.wasm missing_cpp.wasm
+	rm -f missing_cpp.js missing_cpp.wast
+	chmod 644 missing_cpp.wat
diff --git a/test/extensions/wasm/test_data/missing_cpp.cc b/test/extensions/wasm/test_data/missing_cpp.cc
@@ -0,0 +1,6 @@
+// NOLINT(namespace-envoy)
+#include "proxy_wasm_intrinsics.h"
+
+extern "C" void missing();
+
+extern "C" EMSCRIPTEN_KEEPALIVE void proxy_onStart() { missing(); }
diff --git a/test/extensions/wasm/test_data/missing_cpp.wasm b/test/extensions/wasm/test_data/missing_cpp.wasm