##// END OF EJS Templates
test: preserve the existing module policy config for testrepohg resuse...
marmoute -
r52851:16574ca8 stable
parent child Browse files
Show More
@@ -29,6 +29,12 syshgenv () {
29 . "$HGTEST_RESTOREENV"
29 . "$HGTEST_RESTOREENV"
30 HGPLAIN=1
30 HGPLAIN=1
31 export HGPLAIN
31 export HGPLAIN
32 if [ -n "$HGTEST_BASE_HGMODULEPOLICY" ]; then
33 HGMODULEPOLICY="$HGTEST_BASE_HGMODULEPOLICY"
34 else
35 unset HGMODULEPOLICY
36 fi
37 export HGMODULEPOLICY
32 }
38 }
33
39
34 # The test-repo is a live hg repository which may have evolution markers
40 # The test-repo is a live hg repository which may have evolution markers
@@ -223,6 +223,7 if WINDOWS:
223 # For Windows support
223 # For Windows support
224 wifexited = getattr(os, "WIFEXITED", lambda x: False)
224 wifexited = getattr(os, "WIFEXITED", lambda x: False)
225
225
226
226 # Whether to use IPv6
227 # Whether to use IPv6
227 def checksocketfamily(name, port=20058):
228 def checksocketfamily(name, port=20058):
228 """return true if we can listen on localhost using family=name
229 """return true if we can listen on localhost using family=name
@@ -3307,6 +3308,10 class TestRunner:
3307 pypath.append(oldpypath)
3308 pypath.append(oldpypath)
3308 osenvironb[IMPL_PATH] = sepb.join(pypath)
3309 osenvironb[IMPL_PATH] = sepb.join(pypath)
3309
3310
3311 os.environ["HGTEST_BASE_HGMODULEPOLICY"] = os.environ.get(
3312 "HGMODULEPOLICY", ""
3313 )
3314
3310 if self.options.pure:
3315 if self.options.pure:
3311 os.environ["HGTEST_RUN_TESTS_PURE"] = "--pure"
3316 os.environ["HGTEST_RUN_TESTS_PURE"] = "--pure"
3312 os.environ["HGMODULEPOLICY"] = "py"
3317 os.environ["HGMODULEPOLICY"] = "py"
@@ -3397,7 +3402,6 class TestRunner:
3397 os.path.basename(t).startswith(b'test-')
3402 os.path.basename(t).startswith(b'test-')
3398 and (t.endswith(b'.py') or t.endswith(b'.t'))
3403 and (t.endswith(b'.py') or t.endswith(b'.t'))
3399 ):
3404 ):
3400
3401 m = testcasepattern.match(os.path.basename(t))
3405 m = testcasepattern.match(os.path.basename(t))
3402 if m is not None:
3406 if m is not None:
3403 t_basename, casestr = m.groups()
3407 t_basename, casestr = m.groups()
General Comments 0
You need to be logged in to leave comments. Login now