qemu-wrapper: Print test name when failing due to timeout

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>

1 files changed, 22 insertions, 18 deletions

diff --git a/lib/qemu-wrapper.c b/lib/qemu-wrapper.c
index 4c3b6f1..9d4b99e 100644
--- a/lib/qemu-wrapper.c
+++ b/lib/qemu-wrapper.c
@@ -21,15 +21,34 @@ do {							\
 	exit(EXIT_FAILURE);				\
 } while (0)
 
+static char *mprintf(const char *fmt, ...)
+{
+	va_list args;
+	char *str;
+	int ret;
+
+	va_start(args, fmt);
+	ret = vasprintf(&str, fmt, args);
+	va_end(args);
+
+	if (ret < 0)
+		die("insufficient memory");
+
+	return str;
+}
+
 static pid_t child;
 static int childfd;
+static const char *testname;
 
 static void alarm_handler(int sig)
 {
-	char msg[] = "TEST FAILED (timed out)\n";
+	char *msg = mprintf("========= FAILED TIMEOUT %s",
+			    testname ?: "(no test");
 
 	if (write(childfd, msg, strlen(msg)) != strlen(msg))
 		die("write error in alarm handler");
+	free(msg);
 }
 
 static void usage(void)
@@ -46,22 +65,6 @@ static void usage(void)
 	     "      -h              Display this help and exit\n");
 }
 
-static char *mprintf(const char *fmt, ...)
-{
-	va_list args;
-	char *str;
-	int ret;
-
-	va_start(args, fmt);
-	ret = vasprintf(&str, fmt, args);
-	va_end(args);
-
-	if (ret < 0)
-		die("insufficient memory");
-
-	return str;
-}
-
 static char *log_path(const char *logdir, const char *basename, const char *testname)
 {
 	if (!basename)
@@ -241,11 +244,12 @@ again:
 
 		update_watchdog(line);
 
-		const char *testname = test_starts(line);
+		testname = test_starts(line);
 
 		if (test_logfile && testname) {
 			fclose(test_logfile);
 			test_logfile = NULL;
+			testname = NULL;
 		}
 
 		if (test_logfile)