Patchwork [4,of,4,V2] tests: add per-line output conditionals for Windows

login
register
mail settings
Submitter Matt Harbison
Date April 7, 2017, 1:11 a.m.
Message ID <8ccde224a46cd70f1586.1491527503@Envy>
Download mbox | patch
Permalink /patch/19981/
State Accepted
Headers show

Comments

Matt Harbison - April 7, 2017, 1:11 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1491450262 14400
#      Wed Apr 05 23:44:22 2017 -0400
# Node ID 8ccde224a46cd70f1586fcc769ff65a80ddbf354
# Parent  8e3cf915084723551d0b68094cede7e65f49cf39
tests: add per-line output conditionals for Windows

Patch

diff --git a/tests/test-clone.t b/tests/test-clone.t
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -31,10 +31,10 @@ 
   default                       10:a7949464abda
   $ ls .hg/cache
   branch2-served
-  checkisexec
-  checklink
-  checklink-target
-  checknoexec
+  checkisexec (execbit !)
+  checklink (symlink !)
+  checklink-target (symlink !)
+  checknoexec (execbit !)
   rbc-names-v1
   rbc-revs-v1
 
@@ -49,9 +49,9 @@ 
 
   $ ls .hg/cache
   branch2-served
-  checkisexec
-  checklink
-  checklink-target
+  checkisexec (execbit !)
+  checklink (symlink !)
+  checklink-target (symlink !)
 
   $ cat a
   a
diff --git a/tests/test-fileset.t b/tests/test-fileset.t
--- a/tests/test-fileset.t
+++ b/tests/test-fileset.t
@@ -441,10 +441,10 @@ 
   M b2
   A 1k
   A 2k
-  A b2link
+  A b2link (no-windows !)
   A bin
   A c1
-  A con.xml
+  A con.xml (no-windows !)
   R a2
   $ hg status --change 2
   M b2
@@ -452,10 +452,10 @@ 
   M b2
   A 1k
   A 2k
-  A b2link
+  A b2link (no-windows !)
   A bin
   A c1
-  A con.xml
+  A con.xml (no-windows !)
   R a2
   $ hg status --change 4
   A .hgsub
@@ -464,7 +464,7 @@ 
   A dos
   A mac
   A mixed
-  R con.xml
+  R con.xml (no-windows !)
   ! a1
   ? b2.orig
   ? c3
@@ -551,9 +551,9 @@ 
 ------------
 
   $ hg status --removed  --rev 4
-  R con.xml
+  R con.xml (no-windows !)
   $ fileset "status(4, 'wdir()', removed())"
-  con.xml
+  con.xml (no-windows !)
 
   $ hg status --removed --rev 2
   R a2
@@ -585,19 +585,19 @@ 
   A .hgsubstate
   A 1k
   A 2k
-  A b2link
+  A b2link (no-windows !)
   A bin
   A c1
-  A con.xml
+  A con.xml (no-windows !)
   $ fileset "status('0:1', '3:4', added())"
   .hgsub
   .hgsubstate
   1k
   2k
-  b2link
+  b2link (no-windows !)
   bin
   c1
-  con.xml
+  con.xml (no-windows !)
 
 tests with empty value
 ----------------------
diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t
--- a/tests/test-hardlinks.t
+++ b/tests/test-hardlinks.t
@@ -211,10 +211,10 @@ 
   2 r4/.hg/00changelog.i
   2 r4/.hg/branch
   2 r4/.hg/cache/branch2-served
-  2 r4/.hg/cache/checkisexec
+  2 r4/.hg/cache/checkisexec (execbit !)
   3 r4/.hg/cache/checklink (?)
-  ? r4/.hg/cache/checklink-target (glob)
-  2 r4/.hg/cache/checknoexec
+  ? r4/.hg/cache/checklink-target (glob) (symlink !)
+  2 r4/.hg/cache/checknoexec (execbit !)
   2 r4/.hg/cache/rbc-names-v1
   2 r4/.hg/cache/rbc-revs-v1
   2 r4/.hg/dirstate
@@ -251,9 +251,9 @@ 
   2 r4/.hg/00changelog.i
   1 r4/.hg/branch
   2 r4/.hg/cache/branch2-served
-  2 r4/.hg/cache/checkisexec
-  2 r4/.hg/cache/checklink-target
-  2 r4/.hg/cache/checknoexec
+  2 r4/.hg/cache/checkisexec (execbit !)
+  2 r4/.hg/cache/checklink-target (symlink !)
+  2 r4/.hg/cache/checknoexec (execbit !)
   2 r4/.hg/cache/rbc-names-v1
   2 r4/.hg/cache/rbc-revs-v1
   1 r4/.hg/dirstate
diff --git a/tests/test-tags.t b/tests/test-tags.t
--- a/tests/test-tags.t
+++ b/tests/test-tags.t
@@ -672,9 +672,9 @@ 
 
   $ ls tagsclient/.hg/cache
   branch2-served
-  checkisexec
-  checklink
-  checklink-target
+  checkisexec (execbit !)
+  checklink (symlink !)
+  checklink-target (symlink !)
   hgtagsfnodes1
   rbc-names-v1
   rbc-revs-v1
@@ -699,9 +699,9 @@ 
 
   $ ls tagsclient/.hg/cache
   branch2-served
-  checkisexec
-  checklink
-  checklink-target
+  checkisexec (execbit !)
+  checklink (symlink !)
+  checklink-target (symlink !)
   hgtagsfnodes1
   rbc-names-v1
   rbc-revs-v1