From: =?utf-8?q?Guido_G=C3=BCnther?= Date: Fri, 15 Aug 2025 15:58:42 +0200 Subject: Revert "tests: Disable Xwayland in Phoc tests" This needs recent phoc which isn't in forky yet as we're waiting for wlroots 0.19. This reverts commit b1d9d6fa01c486da1dcac3e9baffbaa1910444bd. --- .gitlab-ci.yml | 2 +- tests/meson.build | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80f2001..0fb71cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,7 +39,7 @@ variables: FDO_UPSTREAM_REPO: World/Phosh/phosh-mobile-settings DEBIAN_IMAGE: $CI_REGISTRY/world/phosh/phosh-mobile-settings/debian:v0.0.2025-06-16 COMMON_BUILD_OPTS: --werror -Db_coverage=true - PHOSH_ADDITIONAL_EXPERIMENTAL_PKGS: libgmobile-dev phoc + PHOSH_ADDITIONAL_EXPERIMENTAL_PKGS: libgmobile-dev .trixie_vars: &trixie_vars variables: diff --git a/tests/meson.build b/tests/meson.build index 31eb404..ea3d38e 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -47,7 +47,7 @@ if phoc.found() dependencies: libms_dep, include_directories: include_directories('../src'), ) - test(test, phoc, args: ['--no-xwayland', '-E', t], env: test_env_phoc, suite: ['unit']) + test(test, phoc, args: ['-E', t], env: test_env_phoc, suite: ['unit']) endforeach local_opts = ['debug-info', 'help', 'list', 'version'] @@ -57,11 +57,7 @@ if phoc.found() test( 'test-@0@'.format(opt), phoc, - args: [ - '--no-xwayland', - '-E', - '@0@/src/phosh-mobile-settings --@1@'.format(meson.project_build_root(), opt), - ], + args: ['-E', '@0@/src/phosh-mobile-settings --@1@'.format(meson.project_build_root(), opt)], depends: [pms, compiled], env: test_env_phoc, )