test: print Wasm engine names in test logs. (#254)

While there, sort them alphabetically.

Signed-off-by: Piotr Sikora <[email protected]>

Author: PiotrSikora

test/exports_test.cc

@@ -30,9 +30,10 @@
 namespace proxy_wasm {
 namespace {
 
-auto test_values = testing::ValuesIn(getWasmEngines());
-
-INSTANTIATE_TEST_SUITE_P(WasmEngines, TestVM, test_values);
+INSTANTIATE_TEST_SUITE_P(WasmEngines, TestVM, testing::ValuesIn(getWasmEngines()),
+                         [](const testing::TestParamInfo<std::string> &info) {
+                           return info.param;
+                         });
 
 class TestContext : public ContextBase {
 public:

test/runtime_test.cc

@@ -29,9 +29,10 @@
 namespace proxy_wasm {
 namespace {
 
-auto test_values = testing::ValuesIn(getWasmEngines());
-
-INSTANTIATE_TEST_SUITE_P(WasmEngines, TestVM, test_values);
+INSTANTIATE_TEST_SUITE_P(WasmEngines, TestVM, testing::ValuesIn(getWasmEngines()),
+                         [](const testing::TestParamInfo<std::string> &info) {
+                           return info.param;
+                         });
 
 TEST_P(TestVM, Basic) {
   if (engine_ == "wamr") {

test/utility.cc

@@ -21,14 +21,14 @@ std::vector<std::string> getWasmEngines() {
 #if defined(PROXY_WASM_HOST_ENGINE_V8)
     "v8",
 #endif
-#if defined(PROXY_WASM_HOST_ENGINE_WAVM)
-    "wavm",
+#if defined(PROXY_WASM_HOST_ENGINE_WAMR)
+    "wamr",
 #endif
 #if defined(PROXY_WASM_HOST_ENGINE_WASMTIME)
     "wasmtime",
 #endif
-#if defined(PROXY_WASM_HOST_ENGINE_WAMR)
-    "wamr",
+#if defined(PROXY_WASM_HOST_ENGINE_WAVM)
+    "wavm",
 #endif
     ""
   };

test/wasm_test.cc

@@ -20,9 +20,10 @@
 
 namespace proxy_wasm {
 
-auto test_values = testing::ValuesIn(getWasmEngines());
-
-INSTANTIATE_TEST_SUITE_P(WasmEngines, TestVM, test_values);
+INSTANTIATE_TEST_SUITE_P(WasmEngines, TestVM, testing::ValuesIn(getWasmEngines()),
+                         [](const testing::TestParamInfo<std::string> &info) {
+                           return info.param;
+                         });
 
 // Fail callbacks only used for WasmVMs - not available for NullVM.
 TEST_P(TestVM, GetOrCreateThreadLocalWasmFailCallbacks) {