diff -r a8066f2fd1aa -r 0941ee76489e tests/test-convert
--- a/tests/test-convert	Fri May 29 22:18:16 2009 -0400
+++ b/tests/test-convert	Sun May 31 15:20:31 2009 -0400
@@ -47,4 +47,6 @@
 
 echo % converting empty dir should fail "nicely"
 mkdir emptydir
-PATH=$BINDIR hg convert emptydir 2>&1 | sed 's,file://.*/emptydir,.../emptydir,g'
+# override $PATH to ensure p4 not visible; use $PYTHON in case we're
+# running from a devel copy, not a temp installation
+PATH=$BINDIR $PYTHON $BINDIR/hg convert emptydir 2>&1 | sed 's,file://.*/emptydir,.../emptydir,g'