From 88c6e9d31c695c4500376284a4c3b0e17b665781 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 5 Sep 2017 09:03:54 -0400 Subject: [PATCH] test-lib: --valgrind should not override --verbose-log The --verbose test option cannot be used with test harnesses like "prove". Instead, you must use --verbose-log. Since the --valgrind option implies --verbose, that means that it cannot be used with prove. I.e., this does not work: prove t0000-basic.sh :: --valgrind You'd think it could be fixed by doing: prove t0000-basic.sh :: --valgrind --verbose-log but that doesn't work either, because the implied --verbose takes precedence over --verbose-log. If the user has given us a specific option, we should prefer that. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 5fbd8d4a90..62461a6e35 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -274,7 +274,7 @@ then test -z "$verbose" && verbose_only="$valgrind_only" elif test -n "$valgrind" then - verbose=t + test -z "$verbose_log" && verbose=t fi if test -n "$color" -- 2.11.4.GIT