merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 02 Apr 2012 17:02:50 -0500
changeset 16347 21b31e9c20f3
parent 16346 48692b416fbc (current diff)
parent 16345 825565136235 (diff)
child 16348 f350021ee32e
merge with stable
--- 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