From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 63CD6158011 for ; Sun, 4 Sep 2022 10:57:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 989E6E07E6; Sun, 4 Sep 2022 10:57:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 79E2FE07E6 for ; Sun, 4 Sep 2022 10:57:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 667C8340EE4 for ; Sun, 4 Sep 2022 10:57:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 051EC568 for ; Sun, 4 Sep 2022 10:57:31 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1662289033.13c19aab15dbfb2a21b3489af4d8b5f87c6d1a89.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/xpra/xpra-4.3.3.ebuild x11-wm/xpra/xpra-4.3.4.ebuild x11-wm/xpra/xpra-9999.ebuild X-VCS-Directories: x11-wm/xpra/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 13c19aab15dbfb2a21b3489af4d8b5f87c6d1a89 X-VCS-Branch: master Date: Sun, 4 Sep 2022 10:57:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 61fb1ca7-9258-473c-a265-25bad2bd8013 X-Archives-Hash: 4a0f998d6428b6fc0632cc5baff0a47a commit: 13c19aab15dbfb2a21b3489af4d8b5f87c6d1a89 Author: James Le Cuirot gentoo org> AuthorDate: Sun Sep 4 10:57:13 2022 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Sep 4 10:57:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c19aab x11-wm/xpra: Prevent Wayland from confusing the tests Signed-off-by: James Le Cuirot gentoo.org> x11-wm/xpra/xpra-4.3.3.ebuild | 3 ++- x11-wm/xpra/xpra-4.3.4.ebuild | 3 ++- x11-wm/xpra/xpra-9999.ebuild | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild index a50b752c6ed4..ade4ca7fc866 100644 --- a/x11-wm/xpra/xpra-4.3.3.ebuild +++ b/x11-wm/xpra/xpra-4.3.3.ebuild @@ -185,7 +185,8 @@ python_test() { distutils_install_for_testing xdg_environment_reset - PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \ + env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \ + PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \ XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \ "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die } diff --git a/x11-wm/xpra/xpra-4.3.4.ebuild b/x11-wm/xpra/xpra-4.3.4.ebuild index a0bcf0ffcbc9..b5532cbb6507 100644 --- a/x11-wm/xpra/xpra-4.3.4.ebuild +++ b/x11-wm/xpra/xpra-4.3.4.ebuild @@ -183,7 +183,8 @@ python_test() { distutils_install_for_testing xdg_environment_reset - PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \ + env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \ + PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \ XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \ "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die } diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild index 5dea4bc89ba3..8f90e620cdf4 100644 --- a/x11-wm/xpra/xpra-9999.ebuild +++ b/x11-wm/xpra/xpra-9999.ebuild @@ -182,7 +182,8 @@ python_test() { distutils_install_for_testing xdg_environment_reset - PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \ + env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \ + PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \ XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \ "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die }