[PATCH stable] tests: cat error messages are different on Solaris
danek.duvall at oracle.com
danek.duvall at oracle.com
Mon Jun 9 12:41:26 CDT 2014
# HG changeset patch
# User Danek Duvall <danek.duvall at oracle.com>
# Date 1402335261 25200
# Mon Jun 09 10:34:21 2014 -0700
# Branch stable
# Node ID b35f8c487e396487e89f98e92da57ac5eb9833af
# Parent dedb68a9532cafde83ccafee1ef2c1e6b02ac189
tests: cat error messages are different on Solaris
diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -601,11 +601,9 @@ Test sanitizing ".hg/hgrc" in subrepo
8:3473d20bddcf
$ grep ' s$' .hgsubstate
c4069473b459cf27fd4d7c2f50c4346b4e936599 s
- $ cat s/.hg/hgrc
- cat: s/.hg/hgrc: No such file or directory
+ $ test -e s/.hg/hgrc
[1]
- $ cat s/sub/.hg/hgrc
- cat: s/sub/.hg/hgrc: No such file or directory
+ $ test -e s/sub/.hg/hgrc
[1]
$ cd ..
@@ -636,11 +634,9 @@ additional test for "git merge --ff" rou
$ cd tc
$ hg update -q -C af6d2edbb0d3
- $ cat s/.hg/hgrc
- cat: s/.hg/hgrc: No such file or directory
+ $ test -e s/.hg/hgrc
[1]
- $ cat s/sub/.hg/hgrc
- cat: s/sub/.hg/hgrc: No such file or directory
+ $ test -e s/sub/.hg/hgrc
[1]
$ cd ..
$ hg -R tc pull -q
@@ -652,11 +648,9 @@ additional test for "git merge --ff" rou
9:ed23f7fe024e
$ grep ' s$' .hgsubstate
f262643c1077219fbd3858d54e78ef050ef84fbf s
- $ cat s/.hg/hgrc
- cat: s/.hg/hgrc: No such file or directory
+ $ test -e s/.hg/hgrc
[1]
- $ cat s/sub/.hg/hgrc
- cat: s/sub/.hg/hgrc: No such file or directory
+ $ test -e s/sub/.hg/hgrc
[1]
Test that sanitizing is omitted in meta data area:
More information about the Mercurial-devel
mailing list