D2605: run-tests: allow #require inside #if
quark (Jun Wu)
phabricator at mercurial-scm.org
Sat Mar 3 23:41:50 UTC 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG4e82b6f33e10: run-tests: allow #require inside #if (authored by quark, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2605?vs=6478&id=6518
REVISION DETAIL
https://phab.mercurial-scm.org/D2605
AFFECTED FILES
tests/run-tests.py
tests/test-run-tests.t
CHANGE DETAILS
diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
--- a/tests/test-run-tests.t
+++ b/tests/test-run-tests.t
@@ -921,16 +921,24 @@
================
$ cat > test-skip.t <<EOF
> $ echo xyzzy
+ > #if true
> #require false
+ > #end
+ > EOF
+ $ cat > test-noskip.t <<EOF
+ > #if false
+ > #require false
+ > #endif
> EOF
$ rt --nodiff
- !.s
+ !.s.
Skipped test-skip.t: missing feature: nail clipper
Failed test-failure.t: output changed
- # Ran 2 tests, 1 skipped, 1 failed.
+ # Ran 3 tests, 1 skipped, 1 failed.
python hash seed: * (glob)
[1]
+ $ rm test-noskip.t
$ rt --keyword xyzzy
.s
Skipped test-skip.t: missing feature: nail clipper
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1373,10 +1373,11 @@
lsplit = l.split()
if len(lsplit) < 2 or lsplit[0] != b'#require':
after.setdefault(pos, []).append(' !!! invalid #require\n')
- haveresult, message = self._hghave(lsplit[1:])
- if not haveresult:
- script = [b'echo "%s"\nexit 80\n' % message]
- break
+ if not skipping:
+ haveresult, message = self._hghave(lsplit[1:])
+ if not haveresult:
+ script = [b'echo "%s"\nexit 80\n' % message]
+ break
after.setdefault(pos, []).append(l)
elif l.startswith(b'#if'):
lsplit = l.split()
To: quark, #hg-reviewers, indygreg, durin42
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list