diff options
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/release.mk | 2 | ||||
| -rw-r--r-- | Mk/tests.mk | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Mk/release.mk b/Mk/release.mk index 5c4afe9..e5336e0 100644 --- a/Mk/release.mk +++ b/Mk/release.mk | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # In a checkout it is absent and git answers instead. A release is always | 2 | # In a checkout it is absent and git answers instead. A release is always |
| 3 | # tagged, so in a tarball both of these are that tag, and the gitweb link | 3 | # tagged, so in a tarball both of these are that tag, and the gitweb link |
| 4 | # is to it. Between releases there is no tag and the version is the commit. | 4 | # is to it. Between releases there is no tag and the version is the commit. |
| 5 | VERSION=1.0.0 | 5 | VERSION=2.0.0 |
| 6 | 6 | ||
| 7 | TARBALL_VERSION=test -r .tarball-version && read v < .tarball-version && echo "$$v" | 7 | TARBALL_VERSION=test -r .tarball-version && read v < .tarball-version && echo "$$v" |
| 8 | HAVE_GIT=command -v git >/dev/null && test -d .git | 8 | HAVE_GIT=command -v git >/dev/null && test -d .git |
diff --git a/Mk/tests.mk b/Mk/tests.mk index a7d4fbc..2efdd72 100644 --- a/Mk/tests.mk +++ b/Mk/tests.mk | |||
| @@ -70,11 +70,10 @@ check-integration: opentracker.integration | |||
| 70 | check-tsan: opentracker.tsan | 70 | check-tsan: opentracker.tsan |
| 71 | OPENTRACKER=./opentracker.tsan $(PYTHON) -m unittest discover -s tests/integration | 71 | OPENTRACKER=./opentracker.tsan $(PYTHON) -m unittest discover -s tests/integration |
| 72 | 72 | ||
| 73 | # Only the live sync tests: a build with WANT_SYNC_LIVE refuses to start | 73 | # The whole suite against a build that has live sync, which is also the only |
| 74 | # without a live sync address, so it cannot stand in for the plain binary in | 74 | # way the live sync tests stop skipping. |
| 75 | # the rest of the suite. | ||
| 76 | check-livesync: opentracker.livesync | 75 | check-livesync: opentracker.livesync |
| 77 | OPENTRACKER=./opentracker.livesync $(PYTHON) -m unittest discover -s tests/integration -p 'test_livesync.py' | 76 | OPENTRACKER=./opentracker.livesync $(PYTHON) -m unittest discover -s tests/integration |
| 78 | 77 | ||
| 79 | # Cheapest first, so a quick failure comes back quickly. | 78 | # Cheapest first, so a quick failure comes back quickly. |
| 80 | check-all: | 79 | check-all: |
