annotate tests/testlib/obsmarker-common.sh @ 43699:21e05aabef8c

hghave: add a check for the `xz` compression utility This isn't install by default on Mac, which causes a test failure. The logic for avoiding the command is a little goofy, but nested `#if` isn't supported, and it still seems worth running the hg command to see if anything explodes. With this, the py3 tests run (almost) cleanly on 10.14.6: # Ran 835 tests, 58 skipped, 1 failed. Alas, the mac-packaging test is skipped because it's slow. The failure here is in test-releasenotes-merging.t, complaining about not being able to import the `fuzzywuzzy` module. I have it installed on py3 (thus the test isn't skipped), but not on py2. So there must be some unintended cross pollination here when running `hg` commands. Differential Revision: https://phab.mercurial-scm.org/D7374
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 12 Nov 2019 17:47:42 -0500
parents 86f39a89b63e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1 mkcommit() {
42968
86f39a89b63e testlib: allow more argument to mkcommit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32879
diff changeset
2 name="$1"
86f39a89b63e testlib: allow more argument to mkcommit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32879
diff changeset
3 shift
86f39a89b63e testlib: allow more argument to mkcommit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32879
diff changeset
4 echo "$name" > "$name"
86f39a89b63e testlib: allow more argument to mkcommit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32879
diff changeset
5 hg add "$name"
86f39a89b63e testlib: allow more argument to mkcommit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32879
diff changeset
6 hg ci -m "$name" "$@"
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
7 }
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
8
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
9 getid() {
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
10 hg log --hidden --template '{node}\n' --rev "$1"
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
11 }
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
12
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
13 cat >> $HGRCPATH <<EOF
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
14 [alias]
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
15 debugobsolete=debugobsolete -d '0 0'
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
16 EOF