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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 43C59138334 for ; Mon, 17 Jun 2019 09:13:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D776E08C2; Mon, 17 Jun 2019 09:13:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B347E08C2 for ; Mon, 17 Jun 2019 09:13:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 881F83462BF for ; Mon, 17 Jun 2019 09:12:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DEFB326 for ; Mon, 17 Jun 2019 09:12:57 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1560762765.193a8b642d00a499a3cd92bb794e0494446fc8c2.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfconf/ X-VCS-Repository: repo/gentoo X-VCS-Files: xfce-base/xfconf/xfconf-4.12.1-r1.ebuild xfce-base/xfconf/xfconf-4.13.7.ebuild X-VCS-Directories: xfce-base/xfconf/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 193a8b642d00a499a3cd92bb794e0494446fc8c2 X-VCS-Branch: master Date: Mon, 17 Jun 2019 09:12:57 +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: 96c7a91d-dd58-4295-85e2-081ca9f0049a X-Archives-Hash: f1018c975296fa8b53573ee7947148d9 commit: 193a8b642d00a499a3cd92bb794e0494446fc8c2 Author: Michał Górny gentoo org> AuthorDate: Mon Jun 17 09:12:22 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jun 17 09:12:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=193a8b64 xfce-base/xfconf: Fix tests to run without xfconf installed Start D-Bus session bus with correct service file to make sure xfconf D-Bus tests can spawn and communicate with the daemon. While at it, get rid of unnecessary Xvfb. Closes: https://bugs.gentoo.org/629608 Signed-off-by: Michał Górny gentoo.org> xfce-base/xfconf/xfconf-4.12.1-r1.ebuild | 30 ++++++++++++++++++------------ xfce-base/xfconf/xfconf-4.13.7.ebuild | 29 ++++++++++++++++++----------- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild b/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild index 0f7f61db433..369075b3878 100644 --- a/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild +++ b/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit virtualx xdg-utils +inherit xdg-utils DESCRIPTION="A configuration management system for Xfce" HOMEPAGE="https://www.xfce.org/projects/" @@ -57,20 +57,26 @@ src_compile() { emake OTHERLDFLAGS="${LDFLAGS}" } -my_test() { - local out=$(./xfconfd/xfconfd --daemon) || return 1 - eval "${out}" +src_test() { + local service_dir=${HOME}/.local/share/dbus-1/services + mkdir -p "${service_dir}" || die + cat > "${service_dir}/org.xfce.Xfconf.service" <<-EOF || die + [D-BUS Service] + Name=org.xfce.Xfconf + Exec=${S}/xfconfd/xfconfd + EOF - local ret=0 - # https://bugzilla.xfce.org/show_bug.cgi?id=13840 - nonfatal emake -j1 check || ret=1 + ( + # start isolated dbus session bus + dbus_data=$(dbus-launch --sh-syntax) || exit + eval "${dbus_data}" - kill "${XFCONFD_PID}" || ewarn "Unable to kill xfconfd" - return "${ret}" -} + nonfatal emake check + ret=${?} -src_test() { - virtx my_test + kill "${DBUS_SESSION_BUS_PID}" + exit "${ret}" + ) || die } src_install() { diff --git a/xfce-base/xfconf/xfconf-4.13.7.ebuild b/xfce-base/xfconf/xfconf-4.13.7.ebuild index 82b928dbe4b..8e6b32d8356 100644 --- a/xfce-base/xfconf/xfconf-4.13.7.ebuild +++ b/xfce-base/xfconf/xfconf-4.13.7.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit virtualx xdg-utils +inherit xdg-utils DESCRIPTION="A configuration management system for Xfce" HOMEPAGE="https://www.xfce.org/projects/" @@ -48,19 +48,26 @@ src_compile() { emake OTHERLDFLAGS="${LDFLAGS}" } -my_test() { - local out=$(./xfconfd/xfconfd --daemon) || return 1 - eval "${out}" +src_test() { + local service_dir=${HOME}/.local/share/dbus-1/services + mkdir -p "${service_dir}" || die + cat > "${service_dir}/org.xfce.Xfconf.service" <<-EOF || die + [D-BUS Service] + Name=org.xfce.Xfconf + Exec=${S}/xfconfd/xfconfd + EOF - local ret=0 - nonfatal emake check || ret=1 + ( + # start isolated dbus session bus + dbus_data=$(dbus-launch --sh-syntax) || exit + eval "${dbus_data}" - kill "${XFCONFD_PID}" || ewarn "Unable to kill xfconfd" - return "${ret}" -} + nonfatal emake check + ret=${?} -src_test() { - virtx my_test + kill "${DBUS_SESSION_BUS_PID}" + exit "${ret}" + ) || die } src_install() {