diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:26 -0800 |
| commit | 57cbc53d3e0567d630b3e08be41e555efb06f616 (patch) | |
| tree | 97fbb06114350cebe37f5f68e41206e53e43c7f8 /compat | |
| parent | e7b120bfa5783970c7b270052bd9d2ba31d1c6fd (diff) | |
| parent | ba285a712d8bc036d8f0d4625710305711b3c2cb (diff) | |
| download | git-57cbc53d3e0567d630b3e08be41e555efb06f616.tar.gz | |
Merge branch 'js/vsts-ci'
Prepare to run test suite on Azure Pipeline.
* js/vsts-ci: (22 commits)
test-date: drop unused parameter to getnanos()
ci: parallelize testing on Windows
ci: speed up Windows phase
tests: optionally skip bin-wrappers/
t0061: workaround issues with --with-dashes and RUNTIME_PREFIX
tests: add t/helper/ to the PATH with --with-dashes
mingw: try to work around issues with the test cleanup
tests: include detailed trace logs with --write-junit-xml upon failure
tests: avoid calling Perl just to determine file sizes
README: add a build badge (status of the Azure Pipelines build)
mingw: be more generous when wrapping up the setitimer() emulation
ci: use git-sdk-64-minimal build artifact
ci: add a Windows job to the Azure Pipelines definition
Add a build definition for Azure DevOps
ci/lib.sh: add support for Azure Pipelines
tests: optionally write results as JUnit-style .xml
test-date: add a subcommand to measure times in shell scripts
ci: use a junction on Windows instead of a symlink
ci: inherit --jobs via MAKEFLAGS in run-build-and-tests
ci/lib.sh: encapsulate Travis-specific things
...
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/mingw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 0af8684019..4276297595 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -2175,7 +2175,7 @@ static void stop_timer_thread(void) if (timer_event) SetEvent(timer_event); /* tell thread to terminate */ if (timer_thread) { - int rc = WaitForSingleObject(timer_thread, 1000); + int rc = WaitForSingleObject(timer_thread, 10000); if (rc == WAIT_TIMEOUT) error("timer thread did not terminate timely"); else if (rc != WAIT_OBJECT_0) |