Merge branch 'skip-test-under-sandbox' into 'main'

tests: Skip assert-msg-test.py if gdb fails

See merge request GNOME/glib!3304
This commit is contained in:
Philip Withnall 2023-03-02 17:52:33 +00:00
commit 0df2c607a6

View File

@ -158,9 +158,9 @@ class TestAssertMessage(unittest.TestCase):
# Some CI environments disable ptrace (as theyre running in a
# container). If so, skip the test as theres 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")