Patchwork [5,of,8] test-annotate: conditionalize output instead of tests

login
register
mail settings
Submitter Matt Harbison
Date July 9, 2017, 1:11 a.m.
Message ID <c09262204a6f667250cb.1499562663@Envy>
Download mbox | patch
Permalink /patch/22148/
State Accepted
Headers show

Comments

Matt Harbison - July 9, 2017, 1:11 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1499553524 14400
#      Sat Jul 08 18:38:44 2017 -0400
# Node ID c09262204a6f667250cb120e58ef469fba7b9cdd
# Parent  b446bf544853137de0dda5bd154b9b8159089682
test-annotate: conditionalize output instead of tests

Patch

diff --git a/tests/test-annotate.t b/tests/test-annotate.t
--- a/tests/test-annotate.t
+++ b/tests/test-annotate.t
@@ -553,28 +553,20 @@ 
 annotate missing file
 
   $ rm baz
-#if windows
+
   $ hg annotate -ncr "wdir()" baz
-  abort: $TESTTMP\repo\baz: The system cannot find the file specified
+  abort: $TESTTMP\repo\baz: The system cannot find the file specified (windows !)
+  abort: No such file or directory: $TESTTMP/repo/baz (no-windows !)
   [255]
-#else
-  $ hg annotate -ncr "wdir()" baz
-  abort: No such file or directory: $TESTTMP/repo/baz
-  [255]
-#endif
 
 annotate removed file
 
   $ hg rm baz
-#if windows
+
   $ hg annotate -ncr "wdir()" baz
-  abort: $TESTTMP\repo\baz: The system cannot find the file specified
+  abort: $TESTTMP\repo\baz: The system cannot find the file specified (windows !)
+  abort: No such file or directory: $TESTTMP/repo/baz (no-windows !)
   [255]
-#else
-  $ hg annotate -ncr "wdir()" baz
-  abort: No such file or directory: $TESTTMP/repo/baz
-  [255]
-#endif
 
   $ hg revert --all --no-backup --quiet
   $ hg id -n