changeset 33341:1a4eca3b12dd

test-annotate: conditionalize output instead of tests
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 08 Jul 2017 18:38:44 -0400
parents dd050fc04cc9
children 96eb3f50f75c
files tests/test-annotate.t
diffstat 1 files changed, 6 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-annotate.t	Sat Jul 08 18:37:41 2017 -0400
+++ b/tests/test-annotate.t	Sat Jul 08 18:38:44 2017 -0400
@@ -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