From patchwork Sun Aug 27 12:33:34 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D466: run-tests: make per-line condition support testcase names
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 23372
Message-Id: <6a74ae20be6fa15e38bfcaa944801255@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Sun, 27 Aug 2017 12:33:34 +0000

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6cc8f848b4c3: run-tests: make per-line condition support testcase names (authored by quark).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D466?vs=1133&id=1325#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D466?vs=1133&id=1325

REVISION DETAIL
  https://phab.mercurial-scm.org/D466

AFFECTED FILES
  tests/run-tests.py
  tests/test-run-tests.t

CHANGE DETAILS




To: quark, #hg-reviewers
Cc: mercurial-devel

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
@@ -823,6 +823,20 @@
     2
   #endif
 
+  $ cat >> test-cases.t <<'EOF'
+  > #if a
+  >   $ NAME=A
+  > #else
+  >   $ NAME=B
+  > #endif
+  >   $ echo $NAME
+  >   A (a !)
+  >   B (b !)
+  > EOF
+  $ rt test-cases.t
+  ..
+  # Ran 2 tests, 0 skipped, 0 failed.
+
   $ rm test-cases.t
 
 (reinstall)
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1440,7 +1440,7 @@
                                 conditions = [
                                     c for c in m.group(2).split(b' ')]
 
-                                if not self._hghave(conditions)[0]:
+                                if not self._iftest(conditions):
                                     optional.append(i)
 
                     i += 1
@@ -1474,7 +1474,7 @@
                             if m:
                                 conditions = [c for c in m.group(2).split(b' ')]
 
-                                if self._hghave(conditions)[0]:
+                                if self._iftest(conditions):
                                     # Don't append as optional line
                                     continue
                             else:
@@ -1555,7 +1555,7 @@
                     conditions = [c for c in m.group(2).split(b' ')]
 
                     el = m.group(1) + b"\n"
-                    if not self._hghave(conditions)[0]:
+                    if not self._iftest(conditions):
                         retry = "retry"    # Not required by listed features
 
             if el.endswith(b" (esc)\n"):