Show More
@@ -51,6 +51,7 b' import difflib' | |||||
51 | import distutils.version as version |
|
51 | import distutils.version as version | |
52 | import errno |
|
52 | import errno | |
53 | import json |
|
53 | import json | |
|
54 | import multiprocessing | |||
54 | import os |
|
55 | import os | |
55 | import random |
|
56 | import random | |
56 | import re |
|
57 | import re | |
@@ -287,7 +288,7 b" if 'java' in sys.platform:" | |||||
287 | IMPL_PATH = b'JYTHONPATH' |
|
288 | IMPL_PATH = b'JYTHONPATH' | |
288 |
|
289 | |||
289 | defaults = { |
|
290 | defaults = { | |
290 |
'jobs': ('HGTEST_JOBS', |
|
291 | 'jobs': ('HGTEST_JOBS', multiprocessing.cpu_count()), | |
291 | 'timeout': ('HGTEST_TIMEOUT', 180), |
|
292 | 'timeout': ('HGTEST_TIMEOUT', 180), | |
292 | 'slowtimeout': ('HGTEST_SLOWTIMEOUT', 500), |
|
293 | 'slowtimeout': ('HGTEST_SLOWTIMEOUT', 500), | |
293 | 'port': ('HGTEST_PORT', 20059), |
|
294 | 'port': ('HGTEST_PORT', 20059), |
@@ -15,7 +15,7 b' Define a helper to avoid the install ste' | |||||
15 | ============= |
|
15 | ============= | |
16 | $ rt() |
|
16 | $ rt() | |
17 | > { |
|
17 | > { | |
18 | > "$PYTHON" $TESTDIR/run-tests.py --with-hg=`which hg` "$@" |
|
18 | > "$PYTHON" $TESTDIR/run-tests.py --with-hg=`which hg` -j1 "$@" | |
19 | > } |
|
19 | > } | |
20 |
|
20 | |||
21 | error paths |
|
21 | error paths | |
@@ -1329,7 +1329,7 b' Test globbing of local IP addresses' | |||||
1329 | Add support for external test formatter |
|
1329 | Add support for external test formatter | |
1330 | ======================================= |
|
1330 | ======================================= | |
1331 |
|
1331 | |||
1332 | $ CUSTOM_TEST_RESULT=basic_test_result "$PYTHON" $TESTDIR/run-tests.py --with-hg=`which hg` "$@" test-success.t test-failure.t |
|
1332 | $ CUSTOM_TEST_RESULT=basic_test_result "$PYTHON" $TESTDIR/run-tests.py --with-hg=`which hg` -j1 "$@" test-success.t test-failure.t | |
1333 | running 2 tests using 1 parallel processes |
|
1333 | running 2 tests using 1 parallel processes | |
1334 |
|
1334 | |||
1335 | # Ran 2 tests, 0 skipped, 0 failed. |
|
1335 | # Ran 2 tests, 0 skipped, 0 failed. |
General Comments 0
You need to be logged in to leave comments.
Login now