changeset 44488:0d9ad84a28d9

run-tests: rename "pure" variable to setup_opts There are more useful flag than just `--pure`. We clarify the variable name before adding more options.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 06 Mar 2020 16:24:50 +0100
parents 06b0aa048007
children 9183b7dcfa8d
files tests/run-tests.py
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/tests/run-tests.py	Fri Mar 06 16:06:30 2020 +0100
+++ b/tests/run-tests.py	Fri Mar 06 16:24:50 2020 +0100
@@ -3423,10 +3423,9 @@
         compiler = ''
         if self.options.compiler:
             compiler = '--compiler ' + self.options.compiler
+        setup_opts = b""
         if self.options.pure:
-            pure = b"--pure"
-        else:
-            pure = b""
+            setup_opts = b"--pure"
 
         # Run installer in hg root
         script = os.path.realpath(sys.argv[0])
@@ -3446,14 +3445,14 @@
             # when they happen.
             nohome = b''
         cmd = (
-            b'"%(exe)s" setup.py %(pure)s clean --all'
+            b'"%(exe)s" setup.py %(setup_opts)s clean --all'
             b' build %(compiler)s --build-base="%(base)s"'
             b' install --force --prefix="%(prefix)s"'
             b' --install-lib="%(libdir)s"'
             b' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1'
             % {
                 b'exe': exe,
-                b'pure': pure,
+                b'setup_opts': setup_opts,
                 b'compiler': compiler,
                 b'base': os.path.join(self._hgtmp, b"build"),
                 b'prefix': self._installdir,