# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1333404170 18000
# Node ID 21b31e9c20f3617f47db8ebc91d1ccf60055aca5
# Parent  48692b416fbcfda24d7360aafaac81758c88ffbe# Parent  8255651362357a4d8b05a5e52f085e75c793e5ed
merge with stable

diff -r 48692b416fbc -r 21b31e9c20f3 tests/test-gpg.t
--- 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=
diff -r 48692b416fbc -r 21b31e9c20f3 tests/test-hup.t
--- 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