Patchwork [3,of,4] tests: adjust recent output changes for Windows

login
register
mail settings
Submitter Matt Harbison
Date June 5, 2017, 3:38 a.m.
Message ID <cd84d2ed17926b8de886.1496633930@Envy>
Download mbox | patch
Permalink /patch/21204/
State Accepted
Headers show

Comments

Matt Harbison - June 5, 2017, 3:38 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1496621519 14400
#      Sun Jun 04 20:11:59 2017 -0400
# Node ID cd84d2ed17926b8de886d3d2719a4fa3c7440af0
# Parent  eaed97a21942af11c122607bf37f7399c68cae9d
tests: adjust recent output changes for Windows

Patch

diff --git a/tests/test-dirstate-race.t b/tests/test-dirstate-race.t
--- a/tests/test-dirstate-race.t
+++ b/tests/test-dirstate-race.t
@@ -45,7 +45,7 @@ 
 #endif
 
   $ hg add b dir1 d e
-  adding dir1/c
+  adding dir1/c (glob)
   $ hg commit -m test2
 
   $ cat >> $TESTTMP/dirstaterace.py << EOF
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -1020,12 +1020,12 @@ 
   $ hg cat sub/repo/foo
   test
   test
-  $ hg cat sub/repo/foo -Tjson
+  $ hg cat sub/repo/foo -Tjson | sed 's|\\\\|/|g'
   [
    {
     "abspath": "foo",
     "data": "test\ntest\n",
-    "path": "sub/repo/foo" (glob)
+    "path": "sub/repo/foo"
    }
   ]
   $ mkdir -p tmp/sub/repo