diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-05-17 05:49:01 -0700 |
---|---|---|
committer | Steve Dower <steve.dower@microsoft.com> | 2018-05-17 08:49:01 -0400 |
commit | 8965d75c90e80b6983b36f3ae9601d6a257d782b (patch) | |
tree | 9adfeda35cc8c2b592001d526bf72f6b2953a473 /Tools/ssl | |
parent | 54a5247837a97d8833dc6eba72df0826afe4558d (diff) | |
download | cpython-git-8965d75c90e80b6983b36f3ae9601d6a257d782b.tar.gz |
bpo-33522: Enable CI builds on Visual Studio Team Services (GH-6865) (GH-6926)
(cherry picked from commit e5f41d2f1e0b8b8e61d5fa427c19bd1ea90fd9a3)
Co-authored-by: Steve Dower <steve.dower@microsoft.com>
Diffstat (limited to 'Tools/ssl')
-rwxr-xr-x | Tools/ssl/multissltests.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py index a51566c506..2efc4258de 100755 --- a/Tools/ssl/multissltests.py +++ b/Tools/ssl/multissltests.py @@ -125,6 +125,11 @@ parser.add_argument( "all and runs the test suite." ) ) +parser.add_argument( + '--system', + default='', + help="Override the automatic system type detection." +) class AbstractBuilder(object): @@ -152,6 +157,7 @@ class AbstractBuilder(object): # build directory (removed after install) self.build_dir = os.path.join( self.src_dir, self.build_template.format(version)) + self.system = args.system def __str__(self): return "<{0.__class__.__name__} for {0.version}>".format(self) @@ -255,9 +261,13 @@ class AbstractBuilder(object): log.info("Running build in {}".format(self.build_dir)) cwd = self.build_dir cmd = ["./config", "shared", "--prefix={}".format(self.install_dir)] - self._subprocess_call(cmd, cwd=cwd) + env = None + if self.system: + env = os.environ.copy() + env['SYSTEM'] = self.system + self._subprocess_call(cmd, cwd=cwd, env=env) # Old OpenSSL versions do not support parallel builds. - self._subprocess_call(["make", "-j1"], cwd=cwd) + self._subprocess_call(["make", "-j1"], cwd=cwd, env=env) def _make_install(self, remove=True): self._subprocess_call( |