[PATCH] tests: do not assume run-tests.py sets $BINDIR to a useful value

Greg Ward greg-hg at gerg.ca
Mon May 18 21:33:56 CDT 2009


# HG changeset patch
# User Greg Ward <greg-hg at gerg.ca>
# Date 1242700406 14400
# Node ID f38ec158a7c087c5e8c6352fbdd093e4e658b9fb
# Parent  252232621165917755727729c7f0b9a1f1263668
tests: do not assume run-tests.py sets $BINDIR to a useful value.

(It's not true when someone passes an incorrect --with-hg, and right
now nothing checks that --with-hg is correct.  And I'm about to send
patches that clarify use of --with-hg and drop $BINDIR from the
environment.)

diff --git a/tests/test-convert b/tests/test-convert
--- a/tests/test-convert
+++ b/tests/test-convert
@@ -47,4 +47,4 @@
 
 echo % converting empty dir should fail "nicely"
 mkdir emptydir
-PATH=$BINDIR hg convert emptydir 2>&1 | sed 's,file://.*/emptydir,.../emptydir,g'
+hg convert emptydir 2>&1 | sed 's,file://.*/emptydir,.../emptydir,g'
diff --git a/tests/test-merge-tools b/tests/test-merge-tools
--- a/tests/test-merge-tools
+++ b/tests/test-merge-tools
@@ -60,7 +60,7 @@
 echo "# default is internal merge:"
 beforemerge
 echo "# hg merge -r 2"
-PATH=$BINDIR hg merge -r 2
+hg merge -r 2
 aftermerge
 
 echo "# simplest hgrc using false for merge:"


More information about the Mercurial-devel mailing list