Patchwork [stable] tests: cat error messages are different on Solaris

login
register
mail settings
Submitter Danek Duvall
Date June 9, 2014, 5:41 p.m.
Message ID <b35f8c487e396487e89f.1402335686@smelly>
Download mbox | patch
Permalink /patch/4954/
State Superseded
Commit a5168eb9b2bc488f42809872d22321a9825bc738
Headers show

Comments

Danek Duvall - June 9, 2014, 5:41 p.m.
# HG changeset patch
# User Danek Duvall <danek.duvall@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
Matt Mackall - June 11, 2014, 6:12 p.m.
On Mon, 2014-06-09 at 10:41 -0700, danek.duvall@oracle.com wrote:
> # HG changeset patch
> # User Danek Duvall <danek.duvall@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

Queued for stable, but I had to clean up some check-code complaints:

tests/test-subrepo-git.t:604:
 >   $ test -e s/.hg/hgrc
 don't use 'test -e', use 'test -f'
tests/test-subrepo-git.t:606:
 >   $ test -e s/sub/.hg/hgrc
 don't use 'test -e', use 'test -f'
tests/test-subrepo-git.t:637:
 >   $ test -e s/.hg/hgrc
 don't use 'test -e', use 'test -f'
tests/test-subrepo-git.t:639:
 >   $ test -e s/sub/.hg/hgrc
 don't use 'test -e', use 'test -f'
tests/test-subrepo-git.t:651:
 >   $ test -e s/.hg/hgrc
 don't use 'test -e', use 'test -f'
tests/test-subrepo-git.t:653:
 >   $ test -e s/sub/.hg/hgrc
 don't use 'test -e', use 'test -f'

Patch

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: