Patchwork [4,of,6] test-fastannotate: fix trivial output differences on Windows

login
register
mail settings
Submitter Matt Harbison
Date Aug. 22, 2018, 2:55 a.m.
Message ID <2e2a52088a0ce8370fea.1534906525@Envy>
Download mbox | patch
Permalink /patch/33961/
State Accepted
Headers show

Comments

Matt Harbison - Aug. 22, 2018, 2:55 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1534902224 14400
#      Tue Aug 21 21:43:44 2018 -0400
# Node ID 2e2a52088a0ce8370fea5a8a132edbb041ba5218
# Parent  aba4c08cb0dfebb1f1c1d7738967b414a9ce4c78
test-fastannotate: fix trivial output differences on Windows

Patch

diff --git a/tests/test-fastannotate-hg.t b/tests/test-fastannotate-hg.t
--- a/tests/test-fastannotate-hg.t
+++ b/tests/test-fastannotate-hg.t
@@ -594,28 +594,18 @@  annotate renamed file
 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: $ENOENT$ (windows !)
+  abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !)
   [255]
-#else
-  $ hg annotate -ncr "wdir()" baz
-  abort: $ENOENT$: $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: $ENOENT$ (windows !)
+  abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !)
   [255]
-#else
-  $ hg annotate -ncr "wdir()" baz
-  abort: $ENOENT$: $TESTTMP/repo/baz
-  [255]
-#endif
 
 Test annotate with whitespace options