From 3fae7ad96d89e670a75b1335824c8ad3a92c8db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= Date: Wed, 13 Mar 2019 13:24:18 +0100 Subject: [PATCH] git p4 test: disable '-x' tracing in the p4d watchdog loop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to the comments in 't/lib-git-p4.sh', sometimes 'p4d' seems to hang, and to deal with that 'start_p4d' starts a watchdog process to kill it after a long-enough timeout ($P4D_TIMEOUT, defaults to 300s). This watchdog process is implemented as a background subshell loop iterating once every second until the timeout expires, producing a few lines of trace output on each iteration when the test script is run with '-x' tracing enabled. The watchdog loop's trace gets intermixed with the real test output and trace, and makes that harder to read. Send the trace output of this loop to /dev/null to avoid polluting the real test output. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano --- t/lib-git-p4.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index c18f85082f..547b9f88e1 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -106,7 +106,7 @@ start_p4d () { fi sleep 1 nr_tries_left=$(($nr_tries_left - 1)) - done & + done 2>/dev/null 4>&2 & watchdog_pid=$! ready=