From 76ef639f9bf9046b6512cab10f6e5a81b8a22b6c Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Wed, 21 Oct 2020 02:15:55 +0000 Subject: [PATCH 1/2] wasm: remove no longer needed Emscripten metadata. Signed-off-by: Piotr Sikora --- bazel/repository_locations.bzl | 6 ++-- test/extensions/bootstrap/wasm/wasm_test.cc | 15 -------- test/extensions/common/wasm/wasm_test.cc | 38 --------------------- test/extensions/common/wasm/wasm_vm_test.cc | 1 - 4 files changed, 3 insertions(+), 57 deletions(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 8d60741072d4..0a3de64296e1 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -830,8 +830,8 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "WebAssembly for Proxies (C++ host implementation)", project_desc = "WebAssembly for Proxies (C++ host implementation)", project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host", - version = "c5658d34979abece30882b1eeaa95b6ee965d825", - sha256 = "dc3a794424b7679c3dbcf23548e202aa01e9f9093791b95446b99e8524e03c4f", + version = "2d4bfe9c29fc957c3c4e81e6575773801eedade1", + sha256 = "02b50d42ee715f07314f928dd959ff558a32ea6332a698ee6e21e93632c64f52", strip_prefix = "proxy-wasm-cpp-host-{version}", urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/{version}.tar.gz"], use_category = ["dataplane_ext"], @@ -842,7 +842,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( "envoy.filters.network.wasm", "envoy.stat_sinks.wasm", ], - release_date = "2020-10-16", + release_date = "2020-10-20", cpe = "N/A", ), # TODO: upgrade to the latest version (1.41 currently fails tests) diff --git a/test/extensions/bootstrap/wasm/wasm_test.cc b/test/extensions/bootstrap/wasm/wasm_test.cc index 9511a91c96a9..2befcbd97cba 100644 --- a/test/extensions/bootstrap/wasm/wasm_test.cc +++ b/test/extensions/bootstrap/wasm/wasm_test.cc @@ -222,21 +222,6 @@ TEST_P(WasmTest, DivByZero) { wasm_->isFailed(); } -TEST_P(WasmTest, EmscriptenVersion) { - createWasm(); - const auto code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( - "{{ test_rundir }}/test/extensions/bootstrap/wasm/test_data/segv_cpp.wasm")); - EXPECT_FALSE(code.empty()); - EXPECT_TRUE(wasm_->initialize(code, false)); - uint32_t major = 9, minor = 9, abi_major = 9, abi_minor = 9; - EXPECT_TRUE(wasm_->getEmscriptenVersion(&major, &minor, &abi_major, &abi_minor)); - EXPECT_EQ(major, 0); - EXPECT_LE(minor, 3); - // Up to (at least) emsdk 1.39.6. - EXPECT_EQ(abi_major, 0); - EXPECT_LE(abi_minor, 20); -} - TEST_P(WasmTest, IntrinsicGlobals) { createWasm(); const auto code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( diff --git a/test/extensions/common/wasm/wasm_test.cc b/test/extensions/common/wasm/wasm_test.cc index f17d0ca859d6..24b05bdb6163 100644 --- a/test/extensions/common/wasm/wasm_test.cc +++ b/test/extensions/common/wasm/wasm_test.cc @@ -348,44 +348,6 @@ TEST_P(WasmCommonTest, DivByZero) { wasm->start(plugin); } -TEST_P(WasmCommonTest, EmscriptenVersion) { - if (GetParam() != "v8") { - return; - } - Stats::IsolatedStoreImpl stats_store; - Api::ApiPtr api = Api::createApiForTest(stats_store); - Upstream::MockClusterManager cluster_manager; - Event::DispatcherPtr dispatcher(api->allocateDispatcher("wasm_test")); - auto scope = Stats::ScopeSharedPtr(stats_store.createScope("wasm.")); - NiceMock local_info; - auto name = ""; - auto root_id = ""; - auto vm_id = ""; - auto vm_configuration = ""; - auto plugin_configuration = ""; - const auto code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( - "{{ test_rundir }}/test/extensions/common/wasm/test_data/test_cpp.wasm")); - EXPECT_FALSE(code.empty()); - auto plugin = std::make_shared( - name, root_id, vm_id, GetParam(), plugin_configuration, false, - envoy::config::core::v3::TrafficDirection::UNSPECIFIED, local_info, nullptr); - auto vm_key = proxy_wasm::makeVmKey(vm_id, vm_configuration, code); - auto wasm = std::make_unique( - absl::StrCat("envoy.wasm.runtime.", GetParam()), vm_id, vm_configuration, vm_key, scope, - cluster_manager, *dispatcher); - EXPECT_NE(wasm, nullptr); - auto context = std::make_unique(wasm.get()); - EXPECT_TRUE(wasm->initialize(code, false)); - - uint32_t major = 9, minor = 9, abi_major = 9, abi_minor = 9; - EXPECT_TRUE(wasm->getEmscriptenVersion(&major, &minor, &abi_major, &abi_minor)); - EXPECT_EQ(major, 0); - EXPECT_LE(minor, 3); - // Up to (at least) emsdk 1.39.6. - EXPECT_EQ(abi_major, 0); - EXPECT_LE(abi_minor, 20); -} - TEST_P(WasmCommonTest, IntrinsicGlobals) { Stats::IsolatedStoreImpl stats_store; Api::ApiPtr api = Api::createApiForTest(stats_store); diff --git a/test/extensions/common/wasm/wasm_vm_test.cc b/test/extensions/common/wasm/wasm_vm_test.cc index af7816f20d0a..dd32f0a1ed2b 100644 --- a/test/extensions/common/wasm/wasm_vm_test.cc +++ b/test/extensions/common/wasm/wasm_vm_test.cc @@ -157,7 +157,6 @@ TEST_P(WasmVmTest, V8Code) { EXPECT_TRUE(!wasm_vm->getCustomSection(wasm_vm->getPrecompiledSectionName()).empty()); } EXPECT_THAT(wasm_vm->getCustomSection("producers"), HasSubstr("rustc")); - EXPECT_TRUE(wasm_vm->getCustomSection("emscripten_metadata").empty()); EXPECT_TRUE(wasm_vm->cloneable() == Cloneable::CompiledBytecode); EXPECT_TRUE(wasm_vm->clone() != nullptr); From 964fef9bbf530cd8069114787a3fb9a432cc1b3f Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Wed, 21 Oct 2020 20:30:20 +0000 Subject: [PATCH 2/2] review: fix release date... Signed-off-by: Piotr Sikora --- bazel/repository_locations.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 0a3de64296e1..b3bc82abde4e 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -842,7 +842,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( "envoy.filters.network.wasm", "envoy.stat_sinks.wasm", ], - release_date = "2020-10-20", + release_date = "2020-10-21", cpe = "N/A", ), # TODO: upgrade to the latest version (1.41 currently fails tests)