wasm: add "skip" support to qtwasmtestlib

We're not looking to skip faulty tests, but there are cases
where we would like to indicate that a test function exists
but can't run because some precondition is not met.

Pick-to: 6.4
Change-Id: Ifaaafcfa7a55beaaf56d8b25fabbe3dc2566350f
Reviewed-by: Tor Arne Vestbø <[email protected]>
Reviewed-by: Mikołaj Boc <[email protected]>

1 files changed, 15 insertions, 2 deletions

diff --git a/tests/manual/wasm/qtwasmtestlib/qtwasmtestlib.cpp b/tests/manual/wasm/qtwasmtestlib/qtwasmtestlib.cpp
index 7d1db44cb0e..d86b8ee2c06 100644
--- a/tests/manual/wasm/qtwasmtestlib/qtwasmtestlib.cpp
+++ b/tests/manual/wasm/qtwasmtestlib/qtwasmtestlib.cpp
@@ -45,8 +45,22 @@ void verify(bool condition, std::string_view conditionString, std::string_view f
 // thread-safe and call be called from any thread.
 void completeTestFunction(TestResult result, std::string message)
 {
+    auto resultString = [](TestResult result) {
+        switch (result) {
+        case TestResult::Pass:
+            return "PASS";
+        break;
+        case TestResult::Fail:
+            return "FAIL";
+        break;
+        case TestResult::Skip:
+            return "SKIP";
+        break;
+        }
+    };
+
     // Report test result to JavaScript test runner, on the main thread
-    runOnMainThread([resultString = result == TestResult::Pass ? "PASS" : "FAIL", message](){
+    runOnMainThread([resultString = resultString(result), message](){
         EM_ASM({
             completeTestFunction(UTF8ToString($0), UTF8ToString($1), UTF8ToString($2));
         }, g_currentTestName.c_str(), resultString, message.c_str());
@@ -97,7 +111,6 @@ std::string getTestFunctions()
 void runTestFunction(std::string name)
 {
     g_currentTestName = name;
-    QMetaObject::invokeMethod(g_testObject, "init");
     QMetaObject::invokeMethod(g_testObject, name.c_str());
 }