From 5709a4afcfbc634de617e069b3002c69d161f02c Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Tue, 5 Nov 2019 15:36:04 -0800 Subject: [PATCH] test-runner: special case python3 verbose option Historically if you wanted to see output from a python test you needed to specify -v pytests. This was also the case if IWD was started from python. Nearly every time I run test-runner I would specify "-v iwd,pytests" only to get the IWD output on these specific tests. Instead we can special case 'python3' (previously 'pytests') inside execute_program so that turning on verbosity for 'iwd' also turns it on for the python tests. --- tools/test-runner.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/test-runner.c b/tools/test-runner.c index a83e1252..00989391 100644 --- a/tools/test-runner.c +++ b/tools/test-runner.c @@ -541,13 +541,17 @@ static pid_t execute_program(char *argv[], char *envp[], bool wait, return -1; /* - * We have to special case this. execute_program automatically logs to - * .log, which would put all iwd output into valgrind.log - * rather than iwd.log. Since we are explicitly having valgrind output - * to a log file we can assume any output from this is only IWD, and not - * valgrind. + * We have a few special cases here: + * + * Since execute_program automatically logs to .log this would + * put all iwd output into valgrind.log rather than iwd.log. Since we + * are explicitly having valgrind output to a log file we can assume any + * output from this is only IWD, and not valgrind. + * + * python3 is special cased so that tests which start IWD manually can + * still show IWD output when using -v iwd. */ - if (!strcmp(log_name, "valgrind")) + if (!strcmp(log_name, "valgrind") || !strcmp(log_name, "python3")) log_name = "iwd"; str = l_strjoinv(argv, ' ');