summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2022-06-30 19:44:49 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2022-06-30 19:57:43 -0400
commitbbeff871f262e242c1ed8e41b3b8236ec3816a32 (patch)
tree38e975817c75bda7e514d1bb7ecdf734bab2e9cf
parentd896acb49867134191746ed5bd837ed0a8ddd35d (diff)
qemu-wrapper: include newline in timeout message
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rw-r--r--lib/qemu-wrapper.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/qemu-wrapper.c b/lib/qemu-wrapper.c
index deda943..1783cf6 100644
--- a/lib/qemu-wrapper.c
+++ b/lib/qemu-wrapper.c
@@ -43,8 +43,8 @@ static char *testname;
static void alarm_handler(int sig)
{
- char *msg = mprintf("========= FAILED TIMEOUT %s",
- testname ?: "(no test");
+ char *msg = mprintf("========= FAILED TIMEOUT %s\n",
+ testname ?: "(no test)");
if (write(childfd, msg, strlen(msg)) != strlen(msg))
die("write error in alarm handler");
@@ -283,6 +283,9 @@ again:
if (exit_on_failure && str_starts_with(line, "TEST FAILED"))
break;
+ if (exit_on_failure && strstr(line, "FAILED TIMEOUT"))
+ break;
+
if (exit_on_success && str_starts_with(line, "TEST SUCCESS")) {
ret = 0;
break;