diff options
Diffstat (limited to 'dev-libs/glib')
-rw-r--r-- | dev-libs/glib/Manifest | 3 | ||||
-rw-r--r-- | dev-libs/glib/files/glib-2.74.5-tests-Skip-assert-msg-test.py-if-gdb-fails.patch | 33 | ||||
-rw-r--r-- | dev-libs/glib/glib-2.74.5.ebuild | 2 |
3 files changed, 37 insertions, 1 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index fe0293bc2fa7..ffe11ea868c1 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,6 +1,7 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116 +AUX glib-2.74.5-tests-Skip-assert-msg-test.py-if-gdb-fails.patch 1356 BLAKE2B 42f485dcf2de7dc8a47285eaad083d7d9fe12a8e0b50f65b8093e8046621f371797b3c57ea308f5a99a8db60d103e72fb475256f991b3a894728f30a3e62acef SHA512 a63ad5c2d765bd67ca85455c9cff4859832676a821b4aa438c98cd3ecb9854138f5a26538a6e4d3e542dba1e53cf4114f3dc8e481ff0db00ac27340fa9a57f4e DIST glib-2.74.5.tar.xz 5211852 BLAKE2B 5bf0069cbf949a946357127682e4f687c7e7b8565037024a232b3e905e65bebb86d016832b6274f743005ec8fe5fcd31eaf99ccece82d9d7c3f924d17502c409 SHA512 2716e0fe984cc5d0714e91fe0de47ee71a8bd0b4c85caee337ddb7e02ac2fb3c8c007ccc1207b29cf901c30a7ec8e3bcca75d69c6fab2a32a8cf14bff974e614 DIST glib-2.74.6.tar.xz 5217312 BLAKE2B 07b0a5cb74c1451ba863d5f9a781a122d3d20af1f1227177025de114279277cacada3dd6ab5eb5ad5c0bff5ac7abab6fdfbe0551f44d07b2ddc9141a0640a8c8 SHA512 6b6d113012ec90f6cf77513ec0132668c49aa7224c806181ad662388701004667cdf6d263050d6f896b8688c085abf461aa3e659eb288e6ba93ba4970a2f181b -EBUILD glib-2.74.5.ebuild 10207 BLAKE2B fa9a0da4af627fb0c291de5eb3d4de5e960bdcc22f63b5d9a185e39940c938623ad27d01c3747998a9a840d46c91d4ca9fb91809565c86c7861afb235e5bbcba SHA512 8e45dd1b4cf6d4ae1bd353cf7dfce691e72cb59ec01e002871a57c9959a407895dfa885a1c75aee2367659e82bd8a3528188ee7c9daeb98e53543503a225ca06 +EBUILD glib-2.74.5.ebuild 10277 BLAKE2B 7fb6b90b3dcbeced1cb8a9258279b257fe880072a8844b84b2062766e5d82c2ff2aef141fbb29de0031ffa87c795dc5d6ff62a06f62ae2520880db20eafc0302 SHA512 5d93a71115aab66c0b465221fff9dd18b4580ce58b2aeb677d9dd67e284d5a475f4f373ebea5e52eb78771f0c77574b5843a27e402fa06832fba481ebf613e8e EBUILD glib-2.74.6.ebuild 10215 BLAKE2B a771708382538aad6fce9c6ff14183e505b3d5c7e2d836dc5491484af9109a723278bc720edc55a76e64ceb57aa947a1020dc7479401accba2fb994b4af76e1a SHA512 a2ed96db33cefa8bad4096b1307ba0fc02e09532010e4263ec7f5786f2468612473870d76aca67bbf49af13d654cd3af860b5cd6559177ed67774a3d4153bf15 MISC metadata.xml 1357 BLAKE2B c9236f5cdb72931175f757cd7b713d924655cbbdbba9a45479564a2fb8f73b490923d62b69e84568dcd8cd47df32f9fa1dd51481c332a85713c17ce6f6af5109 SHA512 6fc9c503e81c78e21904f74cedb9dbce10194b7acaecf3f17098749e33ca2513a96a53142bc8c1d9d196e48d62b8752956c30d4813ac34d0616cdf13de37b33b diff --git a/dev-libs/glib/files/glib-2.74.5-tests-Skip-assert-msg-test.py-if-gdb-fails.patch b/dev-libs/glib/files/glib-2.74.5-tests-Skip-assert-msg-test.py-if-gdb-fails.patch new file mode 100644 index 000000000000..ed8fc97b3992 --- /dev/null +++ b/dev-libs/glib/files/glib-2.74.5-tests-Skip-assert-msg-test.py-if-gdb-fails.patch @@ -0,0 +1,33 @@ +From 19a8df9d8bff279a55b0fa3bb7ba4fbf7fcbefa8 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Thu, 2 Mar 2023 00:13:22 -0500 +Subject: [PATCH] tests: Skip assert-msg-test.py if gdb fails + +Similar to commit 6e44151bf74d, skip the test if gdb is unable to read +/proc/PID/mem, which gdb does as a fallback if ptrace is unavailable. + +This allows the test to skip when run under Gentoo's sandbox. +--- + glib/tests/assert-msg-test.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/glib/tests/assert-msg-test.py b/glib/tests/assert-msg-test.py +index 4936fa083..33aa2249e 100755 +--- a/glib/tests/assert-msg-test.py ++++ b/glib/tests/assert-msg-test.py +@@ -158,9 +158,9 @@ class TestAssertMessage(unittest.TestCase): + + # Some CI environments disable ptrace (as they’re running in a + # container). If so, skip the test as there’s nothing we can do. +- if ( +- result.info.returncode != 0 +- and "ptrace: Operation not permitted" in result.err ++ if result.info.returncode != 0 and ( ++ "ptrace: Operation not permitted" in result.err ++ or "warning: opening /proc/PID/mem file for lwp" in result.err + ): + self.skipTest("GDB is not functional due to ptrace being disabled") + +-- +2.39.2 + diff --git a/dev-libs/glib/glib-2.74.5.ebuild b/dev-libs/glib/glib-2.74.5.ebuild index 678d48cb72dd..f0c142206738 100644 --- a/dev-libs/glib/glib-2.74.5.ebuild +++ b/dev-libs/glib/glib-2.74.5.ebuild @@ -69,6 +69,8 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch + + "${FILESDIR}"/${P}-tests-Skip-assert-msg-test.py-if-gdb-fails.patch ) pkg_setup() { |