# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1575295144 -25200
# Node ID cfd31edaa4c7f68a000f47acd8f64d07a219d7fa
# Parent  777a352d2ade0af8e83ba224c40e35f9f0b87f77# Parent  c46f0430a668b594a4a4a136c933b9b547e8bcaf
test-compat: merge mercurial-4.7 into mercurial-4.6

diff -r 777a352d2ade -r cfd31edaa4c7 .gitlab-ci.yml
--- a/.gitlab-ci.yml	Mon Dec 02 14:44:31 2019 +0100
+++ b/.gitlab-ci.yml	Mon Dec 02 20:59:04 2019 +0700
@@ -9,7 +9,8 @@
         - hg pull -R /ci/repos/mercurial/
         - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
         - hg -R /ci/repos/mercurial/ update "$hg_rev"
-        - (cd tests; /ci/repos/mercurial/tests/run-tests.py --color=always)
+        - jobs=$(python -c 'import multiprocessing; print multiprocessing.cpu_count()')
+        - (cd tests; /ci/repos/mercurial/tests/run-tests.py -j $jobs --color=always)
 
 tests-py2-pure:
     image: octobus/ci-py2-hgext3rd
@@ -17,4 +18,5 @@
         - hg pull -R /ci/repos/mercurial/
         - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
         - hg -R /ci/repos/mercurial/ update "$hg_rev"
-        - (cd tests; /ci/repos/mercurial/tests/run-tests.py --color=always --pure)
+        - jobs=$(python -c 'import multiprocessing; print multiprocessing.cpu_count()')
+        - (cd tests; /ci/repos/mercurial/tests/run-tests.py -j $jobs --color=always --pure)