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

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 Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Sat, 7 Dec 2019 04:49:39 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "mharbison72 (Matt Harbison)" <phabricator@mercurial-scm.org> Subject: D7572: tests: stabilize test-extdiff.t on Windows Message-ID: <differential-rev-PHID-DREV-gm5pis5x5rfc55bja2uk-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-gm5pis5x5rfc55bja2uk Thread-Index: ZmMwZTE1MDdiODM4YzQ1ZGJkMjFlNDAxMDI2 MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "mharbison72 \(Matt Harbison\)" <phabricator+D7572+public+d4878359b53600ee@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

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]

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

Comments

Patch