Patchwork D7572: tests: stabilize test-extdiff.t on Windows

login
register
mail settings
Submitter phabricator
Date Dec. 7, 2019, 4:49 a.m.
Message ID <differential-rev-PHID-DREV-gm5pis5x5rfc55bja2uk-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/43631/
State Superseded
Headers show

Comments

phabricator - Dec. 7, 2019, 4:49 a.m.
mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This goes with 765a9c299c44 <https://phab.mercurial-scm.org/rHG765a9c299c442610fc23429d559b5e4cfd332077>.  I'm not sure if we care about the missing file
  being spelled `nul`, so I removed it from the glob to be explicit about it.  The
  line needed to be special cased anyway because of the quoting on Windows.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/test-extdiff.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-extdiff.t b/tests/test-extdiff.t
--- a/tests/test-extdiff.t
+++ b/tests/test-extdiff.t
@@ -525,17 +525,21 @@ 
   $ echo a > a
   $ hg add a
   $ hg falabala
-  diffing * */a (glob)
+  diffing nul "*\\a" (glob) (windows !)
+  diffing /dev/null */a (glob) (no-windows !)
   [1]
   $ hg ci -qm a
   $ hg falabala -c .
-  diffing * */a (glob)
+  diffing nul "*\\a" (glob) (windows !)
+  diffing /dev/null */a (glob) (no-windows !)
   [1]
   $ echo a >> a
   $ hg falabala
-  diffing */a */a (glob)
+  diffing "*\\a" "*\\a" (glob) (windows !)
+  diffing */a */a (glob) (no-windows !)
   [1]
   $ hg ci -qm 2a
   $ hg falabala -c .
-  diffing */a */a (glob)
+  diffing "*\\a" "*\\a" (glob) (windows !)
+  diffing */a */a (glob) (no-windows !)
   [1]