commit: 7fa29ca39c11fccbd1ab9678432f4d45af0bafe5 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Apr 25 15:16:55 2024 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Apr 25 15:17:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa29ca3
x11-base/xwayland: Skip XTS tests Closes: https://bugs.gentoo.org/812686 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> ...wayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch | 36 ++++++++++++++++++++++ x11-base/xwayland/xwayland-23.2.6.ebuild | 5 +-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch b/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch new file mode 100644 index 000000000000..173daa3c6265 --- /dev/null +++ b/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch @@ -0,0 +1,36 @@ +From d5ef57f1efc967fbc88dfa0f0177be354caf039b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaen...@redhat.com> +Date: Tue, 26 Sep 2023 17:23:32 +0200 +Subject: [PATCH xserver] test: Skip Xwayland test early if PIGLIT_DIR / + XTEST_DIR isn't set + +No point starting weston and waiting for it to start up in that case. +--- + test/scripts/xwayland-piglit.sh | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/test/scripts/xwayland-piglit.sh b/test/scripts/xwayland-piglit.sh +index 97a1759d9..9d6e54d01 100755 +--- a/test/scripts/xwayland-piglit.sh ++++ b/test/scripts/xwayland-piglit.sh +@@ -1,5 +1,17 @@ + #!/bin/bash -e + ++if test "x$XTEST_DIR" = "x"; then ++ echo "XTEST_DIR must be set to the directory of the xtest repository." ++ # Exit as a "skip" so make check works even without xtest. ++ exit 77 ++fi ++ ++if test "x$PIGLIT_DIR" = "x"; then ++ echo "PIGLIT_DIR must be set to the directory of the piglit repository." ++ # Exit as a "skip" so make check works even without piglit. ++ exit 77 ++fi ++ + # this times out on Travis, because the tests take too long. + if test "x$TRAVIS_BUILD_DIR" != "x"; then + exit 77 +-- +2.43.2 + diff --git a/x11-base/xwayland/xwayland-23.2.6.ebuild b/x11-base/xwayland/xwayland-23.2.6.ebuild index 70cb8d652e2a..d9e0c35b2c4b 100644 --- a/x11-base/xwayland/xwayland-23.2.6.ebuild +++ b/x11-base/xwayland/xwayland-23.2.6.ebuild @@ -63,8 +63,9 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch - "${FILESDIR}"/xwayland-23.2.3-systemd-automagic.patch + "${FILESDIR}"/${PN}-drop-redundantly-installed-files.patch + "${FILESDIR}"/${PN}-23.2.3-systemd-automagic.patch + "${FILESDIR}"/${PN}-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch ) src_configure() {
