# HG changeset patch # User Matt Harbison # Date 1499553524 14400 # Node ID 1a4eca3b12dd2b704872faf5ca0c0fc344ac4edd # Parent dd050fc04cc9572671198b159ad12ef31a737279 test-annotate: conditionalize output instead of tests diff -r dd050fc04cc9 -r 1a4eca3b12dd tests/test-annotate.t --- 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