Patchwork D8015: heptapod-ci: run the normal test suite

login
register
mail settings
Submitter phabricator
Date Jan. 26, 2020, 7:06 p.m.
Message ID <differential-rev-PHID-DREV-mzwo2fedghnbly7wjlqy-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/44678/
State Superseded
Headers show

Comments

phabricator - Jan. 26, 2020, 7:06 p.m.
marmoute created this revision.
Herald added subscribers: mercurial-devel, mjpieters.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The usual tests should be run too. We skip the "tests-check*.t" one because
  their are already covered by another Ci step.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D8015

AFFECTED FILES
  contrib/heptapod-ci.yml

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mjpieters, 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
@@ -6,6 +6,7 @@ 
     - hg clone . /tmp/mercurial-ci/ --noupdate
     - hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'`
     - cd /tmp/mercurial-ci/
+    - (cd tests; ls -1 test-check-*.*) > /tmp/check-tests.txt
 
 variables:
     PYTHON: python
@@ -14,14 +15,18 @@ 
     script:
         - cd tests/
         - echo "python used, $PYTHON"
-        - $PYTHON run-tests.py --color=always --time test-check-*.*
+        - echo "$RUNTEST_ARGS"
+        - $PYTHON run-tests.py --color=always $RUNTEST_ARGS
 
 checks-py2:
     <<: *runtests
+    variables:
+        RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
 
 checks-py3:
     <<: *runtests
     variables:
+        RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
         PYTHON: python3
 
 rust-cargo-test-py2: &rust_cargo_test
@@ -33,3 +38,14 @@ 
     <<: *rust_cargo_test
     variables:
         PYTHON: python3
+
+test-py2:
+    <<: *runtests
+    variables:
+        RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt"
+
+test-py3:
+    <<: *runtests
+    variables:
+        RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt"
+        PYTHON: python3