Patchwork [2,of,8] test-rebase: conditionalize output instead of tests

login
register
mail settings
Submitter Matt Harbison
Date July 9, 2017, 1:11 a.m.
Message ID <ee6492d95e8e67b00f3f.1499562660@Envy>
Download mbox | patch
Permalink /patch/22144/
State Accepted
Headers show

Comments

Matt Harbison - July 9, 2017, 1:11 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1499537701 14400
#      Sat Jul 08 14:15:01 2017 -0400
# Node ID ee6492d95e8e67b00f3f74a9bde9504a46ec8ffa
# Parent  de324547c7516921c88af18cf7549cc597b32267
test-rebase: conditionalize output instead of tests

This should help prevent breakage like was fixed in the last patch.

Patch

diff --git a/tests/test-rebase-scenario-global.t b/tests/test-rebase-scenario-global.t
--- a/tests/test-rebase-scenario-global.t
+++ b/tests/test-rebase-scenario-global.t
@@ -762,19 +762,13 @@ 
   $ touch subfile
   $ hg add subfile
   $ hg commit -m 'second source with subdir'
-#if rmcwd
+
   $ hg rebase -b . -d 1 --traceback
   rebasing 2:779a07b1b7a0 "first source commit"
-  current directory was removed
-  (consider changing to repo root: $TESTTMP/cwd-vanish)
+  current directory was removed (rmcwd !)
+  (consider changing to repo root: $TESTTMP/cwd-vanish) (rmcwd !)
   rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip)
   saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg (glob)
-#else
-  $ hg rebase -b . -d 1 --traceback
-  rebasing 2:779a07b1b7a0 "first source commit"
-  rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip)
-  saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg (glob)
-#endif
 
 Get back to the root of cwd-vanish. Note that even though `cd ..`
 works on most systems, it does not work on FreeBSD 10, so we use an