From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1160805-garchives=archives.gentoo.org@lists.gentoo.org>
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 43955138239
	for <garchives@archives.gentoo.org>; Sun, 12 Apr 2020 05:12:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1F54EE0A7D;
	Sun, 12 Apr 2020 05:12:20 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 01B09E0A7D
	for <gentoo-commits@lists.gentoo.org>; Sun, 12 Apr 2020 05:12:19 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(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 6E4A334F090
	for <gentoo-commits@lists.gentoo.org>; Sun, 12 Apr 2020 05:12:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id DE72C177
	for <gentoo-commits@lists.gentoo.org>; Sun, 12 Apr 2020 05:12:15 +0000 (UTC)
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1586668334.bf97459c60fe40619001cf96927752f60af189e8.floppym@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/fuse/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-fs/fuse/fuse-3.9.1.ebuild
X-VCS-Directories: sys-fs/fuse/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: bf97459c60fe40619001cf96927752f60af189e8
X-VCS-Branch: master
Date: Sun, 12 Apr 2020 05:12:15 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 512b8543-03a1-4f70-9d8a-bbf3ede7e944
X-Archives-Hash: 7b7d1b66fd044bfa9278368fc9170438

commit:     bf97459c60fe40619001cf96927752f60af189e8
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 05:10:31 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 05:12:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf97459c

sys-fs/fuse: fix tests

Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-fs/fuse/fuse-3.9.1.ebuild | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/sys-fs/fuse/fuse-3.9.1.ebuild b/sys-fs/fuse/fuse-3.9.1.ebuild
index f55f83cd9b7..a858b29b4ec 100644
--- a/sys-fs/fuse/fuse-3.9.1.ebuild
+++ b/sys-fs/fuse/fuse-3.9.1.ebuild
@@ -30,7 +30,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	use test && python_setup
 }
 
 src_prepare() {
@@ -38,13 +38,11 @@ src_prepare() {
 
 	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
 	filter-flags '-flto*'
-
-	# passthough_ll is broken on systems with 32-bit pointers
-	cat /dev/null > example/meson.build || die
 }
 
 multilib_src_configure() {
 	local emesonargs=(
+		-Dexamples=$(usex test true false)
 		-Duseroot=false
 		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
 	)
@@ -55,6 +53,16 @@ multilib_src_compile() {
 	eninja
 }
 
+src_test() {
+	if [[ ${EUID} != 0 ]]; then
+		ewarn "Running as non-root user, skipping tests"
+	elif has sandbox ${FEATURES}; then
+		ewarn "Sandbox enabled, skipping tests"
+	else
+		multilib-minimal_src_test
+	fi
+}
+
 multilib_src_test() {
 	${EPYTHON} -m pytest test || die
 }