Patchwork [2,of,2,STABLE] heptapod-ci: run the test from outside the test directory

login
register
mail settings
Submitter Pierre-Yves David
Date March 10, 2020, 5:17 p.m.
Message ID <247cdc8417916c5fc223.1583860642@nodosa.octobus.net>
Download mbox | patch
Permalink /patch/45672/
State Accepted
Headers show

Comments

Pierre-Yves David - March 10, 2020, 5:17 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1583855378 -3600
#      Tue Mar 10 16:49:38 2020 +0100
# Branch stable
# Node ID 247cdc8417916c5fc223d839e0b702012fa2436d
# Parent  7621c3b5191c951e974c31147b559101c0e9bf48
# EXP-Topic fix-hghave
# Available At https://dev.heptapod.net/octobus/mercurial-devel/
#              hg pull https://dev.heptapod.net/octobus/mercurial-devel/ -r 247cdc841791
heptapod-ci: run the test from outside the test directory

This will help detecting case where this is broken.
Augie Fackler - March 10, 2020, 6:25 p.m.
queued for stable, thanks

> On Mar 10, 2020, at 13:17, Pierre-Yves David <pierre-yves.david@ens-lyon.org> wrote:
> 
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@octobus.net>
> # Date 1583855378 -3600
> #      Tue Mar 10 16:49:38 2020 +0100
> # Branch stable
> # Node ID 247cdc8417916c5fc223d839e0b702012fa2436d
> # Parent  7621c3b5191c951e974c31147b559101c0e9bf48
> # EXP-Topic fix-hghave
> # Available At https://dev.heptapod.net/octobus/mercurial-devel/
> #              hg pull https://dev.heptapod.net/octobus/mercurial-devel/ -r 247cdc841791
> heptapod-ci: run the test from outside the test directory
> 
> This will help detecting case where this is broken.
> 
> diff --git a/contrib/heptapod-ci.yml b/contrib/heptapod-ci.yml
> --- a/contrib/heptapod-ci.yml
> +++ b/contrib/heptapod-ci.yml
> @@ -14,10 +14,9 @@ variables:
> 
> .runtests_template: &runtests
>     script:
> -        - cd tests/
>         - echo "python used, $PYTHON"
>         - echo "$RUNTEST_ARGS"
> -        - HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" run-tests.py --color=always $RUNTEST_ARGS
> +        - HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS
> 
> checks-py2:
>     <<: *runtests
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/contrib/heptapod-ci.yml b/contrib/heptapod-ci.yml
--- a/contrib/heptapod-ci.yml
+++ b/contrib/heptapod-ci.yml
@@ -14,10 +14,9 @@  variables:
 
 .runtests_template: &runtests
     script:
-        - cd tests/
         - echo "python used, $PYTHON"
         - echo "$RUNTEST_ARGS"
-        - HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" run-tests.py --color=always $RUNTEST_ARGS
+        - HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS
 
 checks-py2:
     <<: *runtests