[PATCH 1 of 4 evolve-ext] tests: make tests work on Mac OS

Laurent Charignon lcharignon at fb.com
Fri Apr 3 02:09:55 UTC 2015


# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com>
# Date 1428014651 25200
#      Thu Apr 02 15:44:11 2015 -0700
# Node ID 3a9143852da729fb8c0183ca5bbce2009ea02f8b
# Parent  ffa32ca659f1eb26e0f67e68f698837766819c3f
tests: make tests work on Mac OS

wc -m adds spacing before the results, we trim them to make the test pass on
Mac OS.

diff --git a/tests/test-inhibit.t b/tests/test-inhibit.t
--- a/tests/test-inhibit.t
+++ b/tests/test-inhibit.t
@@ -132,12 +132,12 @@
 check public revision got cleared
 (when adding the second inhibitor, the first one is removed because it is public)
 
-  $ wc -m .hg/store/obsinhibit
+  $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//'
   20 .hg/store/obsinhibit
   $ hg prune 7
   1 changesets pruned
   $ hg debugobsinhibit --hidden 18214586bf78
-  $ wc -m .hg/store/obsinhibit
+  $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//'
   20 .hg/store/obsinhibit
   $ hg log -G
   @  9:55c73a90e4b4 add cJ
@@ -158,7 +158,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at cf5c4f4554ce
   $ hg debugobsinhibit --hidden 55c73a90e4b4
-  $ wc -m .hg/store/obsinhibit
+  $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//'
   20 .hg/store/obsinhibit
   $ hg log -G
   o  9:55c73a90e4b4 add cJ


More information about the Mercurial-devel mailing list