Show More
@@ -3717,15 +3717,18 b' class TestRunner:' | |||||
3717 | vlog("# Performing temporary installation of HG") |
|
3717 | vlog("# Performing temporary installation of HG") | |
3718 | installerrs = os.path.join(self._hgtmp, b"install.err") |
|
3718 | installerrs = os.path.join(self._hgtmp, b"install.err") | |
3719 | compiler = '' |
|
3719 | compiler = '' | |
|
3720 | install_env = original_env.copy() | |||
3720 | if self.options.compiler: |
|
3721 | if self.options.compiler: | |
3721 | compiler = '--compiler ' + self.options.compiler |
|
3722 | compiler = '--compiler ' + self.options.compiler | |
3722 | setup_opts = b"" |
|
3723 | setup_opts = b"" | |
3723 | if self.options.pure: |
|
3724 | if self.options.pure: | |
3724 | setup_opts = b"--pure" |
|
3725 | setup_opts = b"--pure" | |
|
3726 | install_env.pop('HGWITHRUSTEXT', None) | |||
3725 | elif self.options.rust: |
|
3727 | elif self.options.rust: | |
3726 | setup_opts = b"--rust" |
|
3728 | setup_opts = b"--rust" | |
3727 | elif self.options.no_rust: |
|
3729 | elif self.options.no_rust: | |
3728 | setup_opts = b"--no-rust" |
|
3730 | setup_opts = b"--no-rust" | |
|
3731 | install_env.pop('HGWITHRUSTEXT', None) | |||
3729 |
|
3732 | |||
3730 | # Run installer in hg root |
|
3733 | # Run installer in hg root | |
3731 | compiler = _sys2bytes(compiler) |
|
3734 | compiler = _sys2bytes(compiler) | |
@@ -3771,7 +3774,7 b' class TestRunner:' | |||||
3771 | makedirs(self._bindir) |
|
3774 | makedirs(self._bindir) | |
3772 |
|
3775 | |||
3773 | vlog("# Running", cmd.decode("utf-8")) |
|
3776 | vlog("# Running", cmd.decode("utf-8")) | |
3774 |
if subprocess.call(_bytes2sys(cmd), shell=True, env= |
|
3777 | if subprocess.call(_bytes2sys(cmd), shell=True, env=install_env) == 0: | |
3775 | if not self.options.verbose: |
|
3778 | if not self.options.verbose: | |
3776 | try: |
|
3779 | try: | |
3777 | os.remove(installerrs) |
|
3780 | os.remove(installerrs) |
General Comments 0
You need to be logged in to leave comments.
Login now