Mercurial > hg

changeset 16347:21b31e9c20f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Apr 2012 17:02:50 -0500
parents 48692b416fbc (current diff) 825565136235 (diff)
children f350021ee32e
files
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-gpg.t	Mon Apr 02 17:02:03 2012 -0500
+++ b/tests/test-gpg.t	Mon Apr 02 17:02:50 2012 -0500
@@ -1,6 +1,10 @@
 Test the GPG extension
 
   $ "$TESTDIR/hghave" gpg || exit 80
+  $ if ! hg identify -q > /dev/null; then
+  >     echo "skipped: not a Mercurial working dir" >&2
+  >     exit 80
+  > fi
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > gpg=
--- a/tests/test-hup.t	Mon Apr 02 17:02:03 2012 -0500
+++ b/tests/test-hup.t	Mon Apr 02 17:02:50 2012 -0500
@@ -15,7 +15,7 @@
   > kill -HUP $P
   > ) > p
 
-  $ while kill -0 $P 2>/dev/null; do true; done
+  $ wait
   $ cat out
   0
   0