diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2023-03-06 15:36:48 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2023-03-06 15:36:48 +0000 |
| commit | 0559f4b8b6a73ccc3e0261febb6f7a4d91068ba6 (patch) | |
| tree | d78aa39797aae5548e9b86df99496324b0535676 | |
| parent | faf87df568ccbf7ffe2b92822b8c067afdf68d3f (diff) | |
| parent | f36c8876e796f20b6bddcfaf7dad7301c1049c04 (diff) | |
| download | glib-0559f4b8b6a73ccc3e0261febb6f7a4d91068ba6.tar.gz | |
Merge branch 'skip-test-under-sandbox-2.74' into 'glib-2-74'
tests: Skip assert-msg-test.py if gdb fails
See merge request GNOME/glib!3307
| -rwxr-xr-x | glib/tests/assert-msg-test.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/glib/tests/assert-msg-test.py b/glib/tests/assert-msg-test.py index 5e5f3fb23..edc506fe7 100755 --- a/glib/tests/assert-msg-test.py +++ b/glib/tests/assert-msg-test.py @@ -157,9 +157,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") |