public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Anna Vyalkova" <cyber+gentoo@sysrq.in>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: phosh-base/phosh-shell/
Date: Thu, 24 Oct 2024 20:21:36 +0000 (UTC)	[thread overview]
Message-ID: <1729800423.1b94a7b1a5444a83a291ced1ca65a70380f656cd.cybertailor@gentoo> (raw)

commit:     1b94a7b1a5444a83a291ced1ca65a70380f656cd
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Thu Oct 24 20:00:37 2024 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Thu Oct 24 20:07:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1b94a7b1

phosh-base/phosh-shell: disable xwayland for tests

Xwayland makes one of tests flaky and also pollutes /tmp/.X11-unix
without proper cleanup.  We're bettter off without it.

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild | 26 ++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild b/phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild
index 806533951..257395f00 100644
--- a/phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild
+++ b/phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild
@@ -106,14 +106,24 @@ src_configure() {
 }
 
 src_test() {
-	local -x LC_ALL="C.UTF-8"
-	local -x WLR_RENDERER="pixman"
-
-	virtx meson_src_test --suite unit
-	if use test-full; then
-		# Passing "-j 1" because "phosh:integration / shell" test is flaky
-		virtx meson_src_test --suite integration -j 1
-	fi
+	my_src_test() {
+		local -x LC_ALL="C.UTF-8"
+		local -x WLR_RENDERER="pixman"
+		local -x PHOSH_TEST_PHOC_INI="${T}/phoc.ini"
+
+		meson_src_test --suite unit || return 1
+		if use test-full; then
+			meson_src_test --suite integration || return 1
+		fi
+	}
+
+	# Xwayland breaks "phosh:integration / shell", pollutes /tmp
+	cat data/phoc.ini - > "${T}"/phoc.ini <<- EOF || die
+		[core]
+		xwayland=false
+	EOF
+
+	virtx my_src_test
 }
 
 src_install() {


             reply	other threads:[~2024-10-24 20:21 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-24 20:21 Anna Vyalkova [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-11-07 15:40 [gentoo-commits] repo/proj/guru:dev commit in: phosh-base/phosh-shell/ Anna Vyalkova
2025-07-06 16:01 Anna Vyalkova
2025-06-19 16:34 Anna Vyalkova
2025-06-04 17:44 Lucio Sauer
2025-01-02  8:36 Anna Vyalkova
2024-10-19 15:45 Anna Vyalkova
2024-08-20  9:02 Anna Vyalkova
2024-06-30  8:36 Anna Vyalkova
2024-04-09  3:28 Anna Vyalkova
2024-02-11 16:40 Anna Vyalkova
2024-02-04 19:22 Anna Vyalkova

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1729800423.1b94a7b1a5444a83a291ced1ca65a70380f656cd.cybertailor@gentoo \
    --to=cyber+gentoo@sysrq.in \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox