diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch | 51 | ||||
| -rw-r--r-- | sys-apps/keyutils/keyutils-1.5.9-r2.ebuild | 1 |
2 files changed, 52 insertions, 0 deletions
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 000000000000..0a5a02b3a484 --- /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 572489eb7692..0c96c79d7277 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 |