| Submitter | Yuya Nishihara |
|---|---|
| Date | Feb. 12, 2016, 4:12 p.m. |
| Message ID | <8ba8327e01cb9f2ed0a4.1455293559@mimosa> |
| Download | mbox | patch |
| Permalink | /patch/13143/ |
| State | Accepted |
| Headers | show |
Comments
On 02/12/2016 04:12 PM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara <yuya@tcha.org> > # Date 1454836139 -32400 > # Sun Feb 07 18:08:59 2016 +0900 > # Node ID 8ba8327e01cb9f2ed0a4e999a93f308a6465e827 > # Parent 5b4ae8da2b4264b0f61db70f0ea37ad3464dc976 > run-tests: add --chg option to install and run tests using chg > > Because the temporary installation directory is shared between hg and chg, > --chg is not allowed if --with-hg option is specified. Also, --chg option > does not work on FreeBSD because "make" command is hard-coded. These > limitations can be improved later. > > Almost all tests will fail with chg right now. Command line wise this change seems sensible to me, and the code does not seems horrible. I would like another reviewer to look at it before its queued however.
This and part 5 LGTM. > On Feb 12, 2016, at 08:12, Yuya Nishihara <yuya@tcha.org> wrote: > > # HG changeset patch > # User Yuya Nishihara <yuya@tcha.org> > # Date 1454836139 -32400 > # Sun Feb 07 18:08:59 2016 +0900 > # Node ID 8ba8327e01cb9f2ed0a4e999a93f308a6465e827 > # Parent 5b4ae8da2b4264b0f61db70f0ea37ad3464dc976 > run-tests: add --chg option to install and run tests using chg > > Because the temporary installation directory is shared between hg and chg, > --chg is not allowed if --with-hg option is specified. Also, --chg option > does not work on FreeBSD because "make" command is hard-coded. These > limitations can be improved later. > > Almost all tests will fail with chg right now. > > diff --git a/tests/run-tests.py b/tests/run-tests.py > --- a/tests/run-tests.py > +++ b/tests/run-tests.py > @@ -257,6 +257,8 @@ def getparser(): > metavar="HG", > help="test using specified hg script rather than a " > "temporary installation") > + parser.add_option("--chg", action="store_true", > + help="install and use chg wrapper in place of hg") > parser.add_option("--with-chg", metavar="CHG", > help="use specified chg wrapper in place of hg") > parser.add_option("-3", "--py3k-warnings", action="store_true", > @@ -302,14 +304,19 @@ def parseargs(args, parser): > % hgbin) > options.with_hg = hgbin > > + if (options.chg or options.with_chg) and os.name == 'nt': > + parser.error('chg does not work on %s' % os.name) > if options.with_chg: > - if os.name == 'nt': > - parser.error('chg does not work on %s' % os.name) > + options.chg = False # no installation to temporary location > options.with_chg = os.path.realpath( > os.path.expanduser(_bytespath(options.with_chg))) > if not (os.path.isfile(options.with_chg) and > os.access(options.with_chg, os.X_OK)): > parser.error('--with-chg must specify a chg executable') > + if options.chg and options.with_hg: > + # chg shares installation location with hg > + parser.error('--chg does not work when --with-hg is specified ' > + '(use --with-chg instead)') > > options.anycoverage = options.cover or options.annotate or options.htmlcov > if options.anycoverage: > @@ -1963,11 +1970,14 @@ class TestRunner(object): > > # set up crafted chg environment, then replace "hg" command by "chg" > chgbindir = self._bindir > - if self.options.with_chg: > + if self.options.chg or self.options.with_chg: > self._chgsockdir = d = os.path.join(self._hgtmp, b'chgsock') > os.mkdir(d) > osenvironb[b'CHGSOCKNAME'] = os.path.join(d, b"server") > osenvironb[b'CHGHG'] = os.path.join(self._bindir, self._hgcommand) > + if self.options.chg: > + self._hgcommand = b'chg' > + elif self.options.with_chg: > chgbindir = os.path.dirname(os.path.realpath(self.options.with_chg)) > self._hgcommand = os.path.basename(self.options.with_chg) > > @@ -2057,6 +2067,9 @@ class TestRunner(object): > self._checkhglib("Testing") > else: > self._usecorrectpython() > + if self.options.chg: > + assert self._installdir > + self._installchg() > > if self.options.restart: > orig = list(tests) > @@ -2359,6 +2372,27 @@ class TestRunner(object): > > return self._hgpath > > + def _installchg(self): > + """Install chg into the test environment""" > + vlog('# Performing temporary installation of CHG') > + assert os.path.dirname(self._bindir) == self._installdir > + assert self._hgroot, 'must be called after _installhg()' > + cmd = (b'"%(make)s" clean install PREFIX="%(prefix)s"' > + % {b'make': 'make', # TODO: switch by option or environment? > + b'prefix': self._installdir}) > + cwd = os.path.join(self._hgroot, b'contrib', b'chg') > + vlog("# Running", cmd) > + proc = subprocess.Popen(cmd, shell=True, cwd=cwd, > + stdin=subprocess.PIPE, stdout=subprocess.PIPE, > + stderr=subprocess.STDOUT) > + out, _err = proc.communicate() > + if proc.returncode != 0: > + if PYTHON3: > + sys.stdout.buffer.write(out) > + else: > + sys.stdout.write(out) > + sys.exit(1) > + > def _killchgdaemons(self): > """Kill all background chg command servers spawned by tests""" > for f in os.listdir(self._chgsockdir): > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
On 02/15/2016 02:50 AM, Gregory Szorc wrote:
> This and part 5 LGTM.
Pushed to the locwntoper. Thanks.
Let's the bug fixing fest start!
Patch
diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -257,6 +257,8 @@ def getparser(): metavar="HG", help="test using specified hg script rather than a " "temporary installation") + parser.add_option("--chg", action="store_true", + help="install and use chg wrapper in place of hg") parser.add_option("--with-chg", metavar="CHG", help="use specified chg wrapper in place of hg") parser.add_option("-3", "--py3k-warnings", action="store_true", @@ -302,14 +304,19 @@ def parseargs(args, parser): % hgbin) options.with_hg = hgbin + if (options.chg or options.with_chg) and os.name == 'nt': + parser.error('chg does not work on %s' % os.name) if options.with_chg: - if os.name == 'nt': - parser.error('chg does not work on %s' % os.name) + options.chg = False # no installation to temporary location options.with_chg = os.path.realpath( os.path.expanduser(_bytespath(options.with_chg))) if not (os.path.isfile(options.with_chg) and os.access(options.with_chg, os.X_OK)): parser.error('--with-chg must specify a chg executable') + if options.chg and options.with_hg: + # chg shares installation location with hg + parser.error('--chg does not work when --with-hg is specified ' + '(use --with-chg instead)') options.anycoverage = options.cover or options.annotate or options.htmlcov if options.anycoverage: @@ -1963,11 +1970,14 @@ class TestRunner(object): # set up crafted chg environment, then replace "hg" command by "chg" chgbindir = self._bindir - if self.options.with_chg: + if self.options.chg or self.options.with_chg: self._chgsockdir = d = os.path.join(self._hgtmp, b'chgsock') os.mkdir(d) osenvironb[b'CHGSOCKNAME'] = os.path.join(d, b"server") osenvironb[b'CHGHG'] = os.path.join(self._bindir, self._hgcommand) + if self.options.chg: + self._hgcommand = b'chg' + elif self.options.with_chg: chgbindir = os.path.dirname(os.path.realpath(self.options.with_chg)) self._hgcommand = os.path.basename(self.options.with_chg) @@ -2057,6 +2067,9 @@ class TestRunner(object): self._checkhglib("Testing") else: self._usecorrectpython() + if self.options.chg: + assert self._installdir + self._installchg() if self.options.restart: orig = list(tests) @@ -2359,6 +2372,27 @@ class TestRunner(object): return self._hgpath + def _installchg(self): + """Install chg into the test environment""" + vlog('# Performing temporary installation of CHG') + assert os.path.dirname(self._bindir) == self._installdir + assert self._hgroot, 'must be called after _installhg()' + cmd = (b'"%(make)s" clean install PREFIX="%(prefix)s"' + % {b'make': 'make', # TODO: switch by option or environment? + b'prefix': self._installdir}) + cwd = os.path.join(self._hgroot, b'contrib', b'chg') + vlog("# Running", cmd) + proc = subprocess.Popen(cmd, shell=True, cwd=cwd, + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) + out, _err = proc.communicate() + if proc.returncode != 0: + if PYTHON3: + sys.stdout.buffer.write(out) + else: + sys.stdout.write(out) + sys.exit(1) + def _killchgdaemons(self): """Kill all background chg command servers spawned by tests""" for f in os.listdir(self._chgsockdir):