Merge branch 'wip/otte/for-main' into 'main'

Revert commits that disabled the testsuite

See merge request GNOME/gtk!6614

.gitlab-ci.yml

@@ -103,9 +103,8 @@ fedora-x86_64:
             ${FEATURE_FLAGS}
             _build
     - meson compile -C _build
-    # only run tests that are likely affected by test setups
-    - .gitlab-ci/run-tests.sh _build wayland_gl gtk:gdk,gtk:gsk-gl
-    - .gitlab-ci/run-tests.sh _build wayland_gles2 gtk:gdk,gtk:gsk-gl
+    - .gitlab-ci/run-tests.sh _build wayland_gl
+    - .gitlab-ci/run-tests.sh _build wayland_gles2
 
 release-build:
   extends: .build-fedora-default
@@ -130,9 +129,8 @@ release-build:
     - meson install -C _build
     - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
     - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
-    #  this is our full test run with the default setup
-    - .gitlab-ci/run-tests.sh _build wayland gtk:gtk
-    - .gitlab-ci/run-tests.sh _build x11 gtk:gdk,gtk:gsk-gl
+    - .gitlab-ci/run-tests.sh _build wayland
+    - .gitlab-ci/run-tests.sh _build x11
 
 fedora-clang:
   extends: .build-fedora-default
@@ -426,7 +424,9 @@ asan-build:
             -Df16c=disabled
             _build
     - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build wayland gtk
+    - .gitlab-ci/run-tests.sh _build wayland
+    - .gitlab-ci/run-tests.sh _build wayland_gles2
+    - .gitlab-ci/run-tests.sh _build x11
   artifacts:
     when: always
     paths:

.gitlab-ci/run-tests.sh

@@ -5,25 +5,23 @@ set +e
 
 srcdir=$( pwd )
 builddir=$1
-setup=$2
-suite=$3
+backend=$2
 multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1}
 
 # Ignore memory leaks lower in dependencies
 export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1
 export G_SLICE=always-malloc
 
-case "${setup}" in
-  x11*)
+case "${backend}" in
+  x11)
     xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
           meson test -C ${builddir} \
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${setup} \
-                --suite=${suite//,/'--suite='} \
+                --setup=${backend} \
+                --suite=gtk \
                 --no-suite=failing \
-                --no-suite=${setup}_failing \
                 --no-suite=flaky \
                 --no-suite=headless \
                 --no-suite=gsk-compare-broadway
@@ -44,19 +42,19 @@ case "${setup}" in
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${setup} \
-                --suite=${suite//,/'--suite='} \
+                --setup=${backend} \
+                --suite=gtk \
                 --no-suite=failing \
-                --no-suite=${setup}_failing \
                 --no-suite=flaky \
                 --no-suite=headless \
+                --no-suite=${backend}_failing \
                 --no-suite=gsk-compare-broadway
     exit_code=$?
 
     kill ${compositor}
     ;;
 
-  broadway*)
+  broadway)
     export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
 
     ${builddir}/gdk/broadway/gtk4-broadwayd :5 &
@@ -67,10 +65,9 @@ case "${setup}" in
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${setup} \
-                --suite=${suite//,/'--suite='} \
+                --setup=${backend} \
+                --suite=gtk \
                 --no-suite=failing \
-                --no-suite=${setup}_failing \
                 --no-suite=flaky \
                 --no-suite=headless \
                 --no-suite=gsk-compare-opengl
@@ -79,7 +76,7 @@ case "${setup}" in
     ;;
 
   *)
-    echo "Failed to add ${setup} to .gitlab-ci/run-tests.sh"
+    echo "Failed to add ${backend} to .gitlab-ci/run-tests.sh"
     exit 1
     ;;
 
@@ -89,17 +86,17 @@ cd ${builddir}
 
 $srcdir/.gitlab-ci/meson-junit-report.py \
             --project-name=gtk \
-            --backend="${setup}" \
+            --backend="${backend}" \
             --job-id="${CI_JOB_NAME}" \
-            --output="report-${setup}.xml" \
-            "meson-logs/testlog-${setup}.json"
+            --output="report-${backend}.xml" \
+            "meson-logs/testlog-${backend}.json"
 
 $srcdir/.gitlab-ci/meson-html-report.py \
             --project-name=gtk \
-            --backend="${setup}" \
+            --backend="${backend}" \
             --job-id="${CI_JOB_NAME}" \
-            --reftest-output-dir="testsuite/reftests/output/${setup}" \
-            --output="report-${setup}.html" \
-            "meson-logs/testlog-${setup}.json"
+            --reftest-output-dir="testsuite/reftests/output/${backend}" \
+            --output="report-${backend}.html" \
+            "meson-logs/testlog-${backend}.json"
 
 exit $exit_code