Reflect the comments

Author: ingwonsong

.github/workflows/test.yml

@@ -57,15 +57,13 @@ jobs:
         -c opt
         $(bazel query 'kind(was.*_rust_binary, //test/test_data/...)')
         $(bazel query 'kind(_optimized_wasm_cc_binary, //test/test_data/...)')
-
+    # Note `proxy_wasm_cc_binary` generates `_optimized_wasm_cc_binary` rule building the final artifact of `proxy_wasm_cc_binary`.
     - name: Clean up test data
       shell: bash
       run: |
         # Remove temporal directories
-        for i in $(cd bazel-bin/test/test_data && ls -1); do \
-          if [ -d "bazel-bin/test/test_data/$i" ]; then \
-            rm -rf bazel-bin/test/test_data/$i; \
-          fi; \
+        for i in $(find bazel-bin/test/test_data/ -mindepth 1 -maxdepth 1 -type d); do \
+          rm -rf $i; \
         done
 
     - name: Upload test data
@@ -279,6 +277,7 @@ jobs:
         done
 
     - name: Bazel build/test
+      timeout-minutes: 30
       run: >
         ${{ matrix.run_under }}
         bazel ${{ matrix.action }}

test/test_data/configure_check.cc

@@ -45,4 +45,4 @@ static RegisterContextFactory register_TestContext1(CONTEXT_FACTORY(TestContext)
                                                     ROOT_FACTORY(TestRootContext1), "root_id_1");
 
 static RegisterContextFactory register_TestContext2(CONTEXT_FACTORY(TestContext),
-                                                    ROOT_FACTORY(TestRootContext2), "root_id_2");
+                                                    ROOT_FACTORY(TestRootContext2), "root_id_2");

test/utility.h

@@ -137,12 +137,10 @@ class TestContext : public ContextBase {
 
 class TestWasm : public WasmBase {
 public:
-  TestWasm(std::unique_ptr<WasmVm> wasm_vm, std::unordered_map<std::string, std::string> envs = {})
-      : WasmBase(std::move(wasm_vm), "", "", "", std::move(envs), {}) {}
-
-  TestWasm(std::unique_ptr<WasmVm> wasm_vm, std::string_view vm_id,
-           std::string_view vm_configuration, std::string_view vm_key)
-      : WasmBase(std::move(wasm_vm), vm_id, vm_configuration, vm_key, {}, {}) {}
+  TestWasm(std::unique_ptr<WasmVm> wasm_vm, std::unordered_map<std::string, std::string> envs = {},
+           std::string_view vm_id = "", std::string_view vm_configuration = "",
+           std::string_view vm_key = "")
+      : WasmBase(std::move(wasm_vm), vm_id, vm_configuration, vm_key, std::move(envs), {}) {}
 
   TestWasm(const std::shared_ptr<WasmHandleBase> &base_wasm_handle, const WasmVmFactory &factory)
       : WasmBase(base_wasm_handle, factory) {}

test/wasm_test.cc

@@ -115,10 +115,6 @@ TEST_P(TestVm, GetOrCreateThreadLocalWasmFailCallbacks) {
 
 // Tests the canary is always applied when making a call `createWasm`
 TEST_P(TestVm, AlwaysApplyCanary) {
-  // Skip this test for s309x arch because it tooks too much time in CI.
-#if defined(__s390x__) || defined(__zarch__)
-  GTEST_SKIP();
-#endif
   // Use different root_id, but the others are the same
   const auto *const plugin_name = "plugin_name";
 
@@ -160,7 +156,8 @@ TEST_P(TestVm, AlwaysApplyCanary) {
 
   WasmHandleFactory wasm_handle_factory_baseline =
       [this, vm_ids, vm_configs](std::string_view vm_key) -> std::shared_ptr<WasmHandleBase> {
-    auto base_wasm = std::make_shared<TestWasm>(newVm(), vm_ids[0], vm_configs[0], vm_key);
+    auto base_wasm = std::make_shared<TestWasm>(
+        newVm(), std::unordered_map<std::string, std::string>(), vm_ids[0], vm_configs[0], vm_key);
     return std::make_shared<WasmHandleBase>(base_wasm);
   };
 
@@ -190,7 +187,9 @@ TEST_P(TestVm, AlwaysApplyCanary) {
             WasmHandleFactory wasm_handle_factory_comp =
                 [this, vm_id,
                  vm_config](std::string_view vm_key) -> std::shared_ptr<WasmHandleBase> {
-              auto base_wasm = std::make_shared<TestWasm>(newVm(), vm_id, vm_config, vm_key);
+              auto base_wasm = std::make_shared<TestWasm>(
+                  newVm(), std::unordered_map<std::string, std::string>(), vm_id, vm_config,
+                  vm_key);
               return std::make_shared<WasmHandleBase>(base_wasm);
             };
             const auto plugin_comp = std::make_shared<PluginBase>(
@@ -240,4 +239,4 @@ TEST_P(TestVm, AlwaysApplyCanary) {
   }
 }
 
-} // namespace proxy_wasm
+} // namespace proxy_wasm