# HG changeset patch # User Matt Harbison # Date 1491450262 14400 # Node ID d34316ae5c58ce1d0342e2c671c79ee044521151 # Parent 4eec2f04a672a9d53d305e885f762093b805e486 tests: add per-line output conditionals for Windows diff -r 4eec2f04a672 -r d34316ae5c58 tests/test-clone.t --- a/tests/test-clone.t Wed Apr 05 23:17:27 2017 -0400 +++ b/tests/test-clone.t Wed Apr 05 23:44:22 2017 -0400 @@ -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 -r 4eec2f04a672 -r d34316ae5c58 tests/test-fileset.t --- a/tests/test-fileset.t Wed Apr 05 23:17:27 2017 -0400 +++ b/tests/test-fileset.t Wed Apr 05 23:44:22 2017 -0400 @@ -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 -r 4eec2f04a672 -r d34316ae5c58 tests/test-hardlinks.t --- a/tests/test-hardlinks.t Wed Apr 05 23:17:27 2017 -0400 +++ b/tests/test-hardlinks.t Wed Apr 05 23:44:22 2017 -0400 @@ -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 -r 4eec2f04a672 -r d34316ae5c58 tests/test-tags.t --- a/tests/test-tags.t Wed Apr 05 23:17:27 2017 -0400 +++ b/tests/test-tags.t Wed Apr 05 23:44:22 2017 -0400 @@ -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