Patchwork [1,of,2] run-tests: move install.err into test area

login
register
mail settings
Submitter timeless@mozdev.org
Date April 7, 2016, 11:21 a.m.
Message ID <502190ebde8f7489eec8.1460028107@waste.org>
Download mbox | patch
Permalink /patch/14421/
State Accepted
Headers show

Comments

timeless@mozdev.org - April 7, 2016, 11:21 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1460027515 0
#      Thu Apr 07 11:11:55 2016 +0000
# Node ID 502190ebde8f7489eec812006cfb1f7025a73562
# Parent  ea86cdcd9b50bf38c6b9dd7bbaa04b9c8cc0aefb
run-tests: move install.err into test area

Without this, sometimes installerrs generated errors
about no such file. It also did not work well when you
had multiple tests runners running around.

It also did not make sense to pollute the repository test
directory with the log file.
Augie Fackler - April 9, 2016, 1:49 a.m.
On Thu, Apr 07, 2016 at 06:21:47AM -0500, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1460027515 0
> #      Thu Apr 07 11:11:55 2016 +0000
> # Node ID 502190ebde8f7489eec812006cfb1f7025a73562
> # Parent  ea86cdcd9b50bf38c6b9dd7bbaa04b9c8cc0aefb
> run-tests: move install.err into test area

I've taken this one, but I'm not sure how I feel about patch 2, so
I'll leave it for now.

>
> Without this, sometimes installerrs generated errors
> about no such file. It also did not work well when you
> had multiple tests runners running around.
>
> It also did not make sense to pollute the repository test
> directory with the log file.
>
> diff --git a/tests/run-tests.py b/tests/run-tests.py
> --- a/tests/run-tests.py
> +++ b/tests/run-tests.py
> @@ -2313,7 +2313,7 @@
>          This will also configure hg with the appropriate testing settings.
>          """
>          vlog("# Performing temporary installation of HG")
> -        installerrs = os.path.join(b"tests", b"install.err")
> +        installerrs = os.path.join(self._hgtmp, b"install.err")
>          compiler = ''
>          if self.options.compiler:
>              compiler = '--compiler ' + self.options.compiler
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -2313,7 +2313,7 @@ 
         This will also configure hg with the appropriate testing settings.
         """
         vlog("# Performing temporary installation of HG")
-        installerrs = os.path.join(b"tests", b"install.err")
+        installerrs = os.path.join(self._hgtmp, b"install.err")
         compiler = ''
         if self.options.compiler:
             compiler = '--compiler ' + self.options.compiler