heptapod-ci: run the normal test suite
The usual tests should be run too. We skip the "tests-check*.t" one because
their are already covered by another Ci step.
Differential Revision: https://phab.mercurial-scm.org/D8015
--- a/contrib/heptapod-ci.yml Mon Nov 18 09:38:40 2019 +0100
+++ b/contrib/heptapod-ci.yml Sat Jan 25 14:56:36 2020 +0100
@@ -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