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 885D4139085 for ; Thu, 19 Jan 2017 16:55:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD3CFE0CE6; Thu, 19 Jan 2017 16:55:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A794AE0CE6 for ; Thu, 19 Jan 2017 16:55:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 947E7335DEF for ; Thu, 19 Jan 2017 16:55:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3EBA2942 for ; Thu, 19 Jan 2017 16:55:07 +0000 (UTC) From: "Mike Frysinger" 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 Frysinger" Message-ID: <1484844886.41318c00bfbdba74249f88cde3e64ddfdc240cce.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/keyutils/, sys-apps/keyutils/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch sys-apps/keyutils/keyutils-1.5.9-r2.ebuild X-VCS-Directories: sys-apps/keyutils/files/ sys-apps/keyutils/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 41318c00bfbdba74249f88cde3e64ddfdc240cce X-VCS-Branch: master Date: Thu, 19 Jan 2017 16:55:07 +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-Archives-Salt: 699bba38-6864-43d2-b045-d68cf92aeff2 X-Archives-Hash: 429d73afb263c28ace84bf5165a2e329 commit: 41318c00bfbdba74249f88cde3e64ddfdc240cce Author: Mike Frysinger gentoo org> AuthorDate: Thu Jan 19 16:54:46 2017 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Jan 19 16:54:46 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41318c00 sys-apps/keyutils: disable tests that modify global system settings #519062 #522050 .../files/keyutils-1.5.9-disable-tests.patch | 51 ++++++++++++++++++++++ sys-apps/keyutils/keyutils-1.5.9-r2.ebuild | 1 + 2 files changed, 52 insertions(+) diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch b/sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch new file mode 100644 index 00000000..0a5a02b --- /dev/null +++ b/sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch @@ -0,0 +1,51 @@ +disable tests that mess with system wide settings + +https://bugs.gentoo.org/519062 + +--- a/tests/bugzillas/bz1031154/runtest.sh ++++ b/tests/bugzillas/bz1031154/runtest.sh +@@ -11,6 +11,8 @@ + result=PASS + echo "++++ BEGINNING TEST" >$OUTPUTFILE + ++if false; then ++ + # we need a reference time to scan the audit log from so as not to pick up old + # results from this test. + base_date=`date +"%x@%X"` +@@ -81,6 +83,10 @@ + fi + fi + ++else ++marker "Gentoo: skipping test due to system wide modifications" ++fi ++ + echo "++++ FINISHED TEST: $result" >>$OUTPUTFILE + + # --- then report the results in the database --- + +https://bugs.gentoo.org/522050 + +--- a/tests/keyctl/padd/useradd/runtest.sh ++++ b/tests/keyctl/padd/useradd/runtest.sh +@@ -40,6 +40,8 @@ + marker "UNLINK KEY" + unlink_key $keyid @s + ++if false; then ++ + # add keys with huge payloads + old_root_quota=`cat /proc/sys/kernel/keys/root_maxbytes` + if [ $old_root_quota -lt 65536 ] +@@ -76,6 +78,10 @@ + sleep 1 + fi + ++else ++marker "Gentoo: skipping test due to system wide modifications" ++fi ++ + echo "++++ FINISHED TEST: $result" >>$OUTPUTFILE + + # --- then report the results in the database --- diff --git a/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild index 572489e..0c96c79 100644 --- a/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild +++ b/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild @@ -28,6 +28,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch epatch "${FILESDIR}"/${PN}-1.5.9-endian-check-{1,2}.patch #426424 + epatch "${FILESDIR}"/${PN}-1.5.9-disable-tests.patch #519062 #522050 # The lsb check is useless, so avoid spurious command not found messages. sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die