test-annotate: conditionalize error output for Windows
authorMatt Harbison <matt_harbison@yahoo.com>
Sun, 29 Mar 2015 00:20:56 -0400
changeset 24498 ab3a8ed7cf1d
parent 24497 2e0301ac5c91
child 24499 90db70de6f9c
test-annotate: conditionalize error output for Windows It seems better to leave the actual output in place instead of globbing everything but 'abort:', in case it starts aborting for other reasons. It isn't clear the purpose for reversing the file name position, but that originates in windows.posixfile.
tests/test-annotate.t
--- a/tests/test-annotate.t	Sat Mar 28 23:57:16 2015 -0400
+++ b/tests/test-annotate.t	Sun Mar 29 00:20:56 2015 -0400
@@ -457,16 +457,28 @@
 annotate missing file
 
   $ rm baz
+#if windows
+  $ hg annotate -ncr "wdir()" baz
+  abort: $TESTTMP\repo\baz: The system cannot find the file specified
+  [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
+  [255]
+#else
   $ hg annotate -ncr "wdir()" baz
   abort: No such file or directory: $TESTTMP/repo/baz
   [255]
+#endif
 
 Test annotate with whitespace options