wasm: move wasm tests to own subdirectories

Match the standard one-test-per-directory setup.

Change-Id: I0e29e3c5626ef5f739b1680d53a2a74f0c77f9be
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>

12 files changed, 106 insertions, 40 deletions

diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 74e7b2c5dd..bd2cbcd72b 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -71,6 +71,10 @@ if(WASM)
     return()
 endif()
 
+if(WASM)
+    add_subdirectory(wasm)
+endif()
+
 add_subdirectory(testlib)
 if(NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_process)
      add_subdirectory(tools)
diff --git a/tests/auto/wasm/CMakeLists.txt b/tests/auto/wasm/CMakeLists.txt
index ee60817410..35b4d45e53 100644
--- a/tests/auto/wasm/CMakeLists.txt
+++ b/tests/auto/wasm/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-#####################################################################
-## tst_wasm Test:
-#####################################################################
-
-add_subdirectory(misc)
+add_subdirectory(fetchapi)
+add_subdirectory(localfileapi)
+add_subdirectory(qwasmkeytranslator)
+add_subdirectory(qwasmwindowstack)
+add_subdirectory(qwasmwindowtreenode)
 add_subdirectory(selenium)
diff --git a/tests/auto/wasm/fetchapi/CMakeLists.txt b/tests/auto/wasm/fetchapi/CMakeLists.txt
new file mode 100644
index 0000000000..335eefc1da
--- /dev/null
+++ b/tests/auto/wasm/fetchapi/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## tst_localfileapi Test:
+#####################################################################
+
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_fetchapi LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
+qt_internal_add_test(tst_fetchapi
+    SOURCES
+        tst_fetchapi.cpp
+    DEFINES
+        QT_NO_FOREACH
+    LIBRARIES
+        Qt::Core
+        Qt::Network
+)
diff --git a/tests/auto/wasm/tst_fetchapi.cpp b/tests/auto/wasm/fetchapi/tst_fetchapi.cpp
index 3dcd8dd916..3dcd8dd916 100644
--- a/tests/auto/wasm/tst_fetchapi.cpp
+++ b/tests/auto/wasm/fetchapi/tst_fetchapi.cpp
diff --git a/tests/auto/wasm/misc/CMakeLists.txt b/tests/auto/wasm/localfileapi/CMakeLists.txt
index 124ef86633..efb29ad48c 100644
--- a/tests/auto/wasm/misc/CMakeLists.txt
+++ b/tests/auto/wasm/localfileapi/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
-## tst_wasm Test:
+## tst_localfileapi Test:
 #####################################################################
 
 if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
@@ -22,37 +22,3 @@ qt_internal_add_test(tst_localfileapi
         Qt::Gui
         Qt::Widgets
 )
-
-qt_internal_add_test(tst_qwasmwindowstack
-    SOURCES
-        tst_qwasmwindowstack.cpp
-    DEFINES
-        QT_NO_FOREACH
-    LIBRARIES
-        Qt::GuiPrivate
-        Qt::Core
-        Qt::Gui
-        Qt::Widgets
-)
-
-qt_internal_add_test(tst_qwasmwindowtreenode
-    SOURCES
-        tst_qwasmwindowtreenode.cpp
-    DEFINES
-        QT_NO_FOREACH
-    LIBRARIES
-        Qt::GuiPrivate
-        Qt::Core
-        Qt::Gui
-        Qt::Widgets
-)
-
-qt_internal_add_test(tst_qwasmkeytranslator
-    SOURCES
-        tst_qwasmkeytranslator.cpp
-    DEFINES
-        QT_NO_FOREACH
-    LIBRARIES
-        Qt::GuiPrivate
-        Qt::Core
-)
diff --git a/tests/auto/wasm/misc/tst_localfileapi.cpp b/tests/auto/wasm/localfileapi/tst_localfileapi.cpp
index 47e8c06e1e..47e8c06e1e 100644
--- a/tests/auto/wasm/misc/tst_localfileapi.cpp
+++ b/tests/auto/wasm/localfileapi/tst_localfileapi.cpp
diff --git a/tests/auto/wasm/qwasmkeytranslator/CMakeLists.txt b/tests/auto/wasm/qwasmkeytranslator/CMakeLists.txt
new file mode 100644
index 0000000000..b999dbe028
--- /dev/null
+++ b/tests/auto/wasm/qwasmkeytranslator/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## tst_qwasmkeytranslator Test:
+#####################################################################
+
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qwasmkeytranslator LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
+qt_internal_add_test(tst_qwasmkeytranslator
+    SOURCES
+        tst_qwasmkeytranslator.cpp
+    DEFINES
+        QT_NO_FOREACH
+    LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
diff --git a/tests/auto/wasm/misc/tst_qwasmkeytranslator.cpp b/tests/auto/wasm/qwasmkeytranslator/tst_qwasmkeytranslator.cpp
index de06c298df..de06c298df 100644
--- a/tests/auto/wasm/misc/tst_qwasmkeytranslator.cpp
+++ b/tests/auto/wasm/qwasmkeytranslator/tst_qwasmkeytranslator.cpp
diff --git a/tests/auto/wasm/qwasmwindowstack/CMakeLists.txt b/tests/auto/wasm/qwasmwindowstack/CMakeLists.txt
new file mode 100644
index 0000000000..4b22d8a2eb
--- /dev/null
+++ b/tests/auto/wasm/qwasmwindowstack/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## tst_qwasmwindowstack Test:
+#####################################################################
+
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qwasmwindowstack LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
+qt_internal_add_test(tst_qwasmwindowstack
+    SOURCES
+        tst_qwasmwindowstack.cpp
+    DEFINES
+        QT_NO_FOREACH
+    LIBRARIES
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/wasm/misc/tst_qwasmwindowstack.cpp b/tests/auto/wasm/qwasmwindowstack/tst_qwasmwindowstack.cpp
index fe169b52dc..fe169b52dc 100644
--- a/tests/auto/wasm/misc/tst_qwasmwindowstack.cpp
+++ b/tests/auto/wasm/qwasmwindowstack/tst_qwasmwindowstack.cpp
diff --git a/tests/auto/wasm/qwasmwindowtreenode/CMakeLists.txt b/tests/auto/wasm/qwasmwindowtreenode/CMakeLists.txt
new file mode 100644
index 0000000000..dc292f6337
--- /dev/null
+++ b/tests/auto/wasm/qwasmwindowtreenode/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## tst_qwasmwindowtreenode Test:
+#####################################################################
+
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qwasmwindowtreenode LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
+qt_internal_add_test(tst_qwasmwindowtreenode
+    SOURCES
+        tst_qwasmwindowtreenode.cpp
+    DEFINES
+        QT_NO_FOREACH
+    LIBRARIES
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/wasm/misc/tst_qwasmwindowtreenode.cpp b/tests/auto/wasm/qwasmwindowtreenode/tst_qwasmwindowtreenode.cpp
index 763dbf9a07..763dbf9a07 100644
--- a/tests/auto/wasm/misc/tst_qwasmwindowtreenode.cpp
+++ b/tests/auto/wasm/qwasmwindowtreenode/tst_qwasmwindowtreenode.cpp