mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-18 20:47:54 +00:00
fix(ci): Remove use of make for Windows CI runs
This reverts a part of commit a6c50160e3
.
This commit is contained in:
parent
362c121426
commit
dc203e2fb2
4
Makefile
4
Makefile
@ -253,7 +253,9 @@ src/allmydata/_version.py:
|
||||
# After changes:
|
||||
# `$ make .tox/make-test-py3-all.diff`
|
||||
$(foreach side,old new,.tox/make-test-py3-all-$(side).log):
|
||||
(tox --develop -e py36-coverage allmydata || true) | \
|
||||
tox --develop --notest -e py36-coverage
|
||||
(make VIRTUAL_ENV=.tox/py36-coverage TEST_SUITE=allmydata test-venv-coverage \
|
||||
|| true) | \
|
||||
sed -E 's/\([0-9]+\.[0-9]{3} secs\)/(#.### secs)/' | tee "$(@)"
|
||||
.tox/make-test-py3-all.diff: .tox/make-test-py3-all-new.log
|
||||
(diff -u "$(<:%-new.log=%-old.log)" "$(<)" || true) | tee "$(@)"
|
||||
|
4
tox.ini
4
tox.ini
@ -64,7 +64,9 @@ commands =
|
||||
|
||||
# measuring coverage is somewhat slower than not measuring coverage
|
||||
# so only do it on request.
|
||||
coverage: make -e TEST_SUITE={posargs:{env:TEST_SUITE}} test-venv-coverage
|
||||
coverage: coverage run -m twisted.trial {env:TAHOE_LAFS_TRIAL_ARGS:--rterrors --reporter=timing} {posargs:{env:TEST_SUITE}}
|
||||
coverage: coverage combine
|
||||
coverage: coverage xml
|
||||
|
||||
|
||||
[testenv:integration]
|
||||
|
Loading…
Reference in New Issue
Block a user