From patchwork Sun Jul  9 01:11:02 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [4,of,8] test-addremove: conditionalize output instead of tests
From: Matt Harbison <mharbison72@gmail.com>
X-Patchwork-Id: 22147
Message-Id: <b446bf544853137de0dd.1499562662@Envy>
To: mercurial-devel@mercurial-scm.org
Date: Sat, 08 Jul 2017 21:11:02 -0400

# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1499553461 14400
#      Sat Jul 08 18:37:41 2017 -0400
# Node ID b446bf544853137de0dda5bd154b9b8159089682
# Parent  a2b6bcfce0db950addd5bbbf2dc58978262a88d8
test-addremove: conditionalize output instead of tests

diff --git a/tests/test-addremove.t b/tests/test-addremove.t
--- a/tests/test-addremove.t
+++ b/tests/test-addremove.t
@@ -29,15 +29,12 @@
   $ hg -v addremove
   adding foo
   $ hg forget foo
-#if windows
+
   $ hg -v addremove nonexistent
-  nonexistent: The system cannot find the file specified
+  nonexistent: The system cannot find the file specified (windows !)
+  nonexistent: No such file or directory (no-windows !)
   [1]
-#else
-  $ hg -v addremove nonexistent
-  nonexistent: No such file or directory
-  [1]
-#endif
+
   $ cd ..
 
   $ hg init subdir
@@ -87,17 +84,13 @@
   adding c
 
   $ rm c
-#if windows
+
   $ hg ci -A -m "c" nonexistent
-  nonexistent: The system cannot find the file specified
+  nonexistent: The system cannot find the file specified (windows !)
+  nonexistent: No such file or directory (no-windows !)
   abort: failed to mark all new/missing files as added/removed
   [255]
-#else
-  $ hg ci -A -m "c" nonexistent
-  nonexistent: No such file or directory
-  abort: failed to mark all new/missing files as added/removed
-  [255]
-#endif
+
   $ hg st
   ! c
   $ cd ..