diff options
| author | SZEDER Gábor <szeder.dev@gmail.com> | 2019-03-13 12:24:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-14 03:34:39 (GMT) |
| commit | 3fae7ad96d89e670a75b1335824c8ad3a92c8db0 (patch) | |
| tree | 94430b753c09b1167469b0db515e37c4e0a8873e /t/lib-git-p4.sh | |
| parent | 0e67c32955cee24c5ff534dd3f5f0de58ba91d02 (diff) | |
| download | git-3fae7ad96d89e670a75b1335824c8ad3a92c8db0.zip git-3fae7ad96d89e670a75b1335824c8ad3a92c8db0.tar.gz git-3fae7ad96d89e670a75b1335824c8ad3a92c8db0.tar.bz2 | |
git p4 test: disable '-x' tracing in the p4d watchdog loop
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 <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-git-p4.sh')
| -rw-r--r-- | t/lib-git-p4.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index c18f850..547b9f8 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= |