From: Alex Bennée Date: Tue, 19 Apr 2022 09:10:20 +0000 (+0100) Subject: tests/guest-debug: better handle gdb crashes X-Git-Tag: v7.1.0-rc0~145^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=caccf599181e2ea5f236345de9d9957a4c23e5ec;p=thirdparty%2Fqemu.git tests/guest-debug: better handle gdb crashes There are a number of GDB's on various distros which fail fairly hard when attempting to talk to a cross-arch guest. The previous attempt to catch this was incorrect as the shell will deliver signals as 128+n. Fix the detection and while we are it improve the logging we dump into the test output. Signed-off-by: Alex Bennée Reported-by: Gautam Agrawal Reviewed-by: Richard Henderson Message-Id: <20220419091020.3008144-26-alex.bennee@linaro.org> --- diff --git a/tests/guest-debug/run-test.py b/tests/guest-debug/run-test.py index 2e58795a100..d865e46ecdd 100755 --- a/tests/guest-debug/run-test.py +++ b/tests/guest-debug/run-test.py @@ -92,17 +92,18 @@ if __name__ == '__main__': result = subprocess.call(gdb_cmd, shell=True, stdout=output) - # A negative result is the result of an internal gdb failure like - # a crash. We force a return of 0 so we don't fail the test on + # A result of greater than 128 indicates a fatal signal (likely a + # crash due to gdb internal failure). That's a problem for GDB and + # not the test so we force a return of 0 so we don't fail the test on # account of broken external tools. - if result < 0: - print("GDB crashed? SKIPPING") + if result > 128: + log(output, "GDB crashed? (%d, %d) SKIPPING" % (result, result - 128)) exit(0) try: inferior.wait(2) except subprocess.TimeoutExpired: - print("GDB never connected? Killed guest") + log(output, "GDB never connected? Killed guest") inferior.kill() exit(result)