Show More
@@ -599,8 +599,9 b' def tsttest(test, wd, options, replaceme' | |||||
599 |
|
599 | |||
600 | def hghave(reqs): |
|
600 | def hghave(reqs): | |
601 | # TODO: do something smarter when all other uses of hghave is gone |
|
601 | # TODO: do something smarter when all other uses of hghave is gone | |
|
602 | tdir = TESTDIR.replace('\\', '/') | |||
602 | proc = Popen4('%s -c "%s/hghave %s"' % |
|
603 | proc = Popen4('%s -c "%s/hghave %s"' % | |
603 |
(options.shell, |
|
604 | (options.shell, tdir, ' '.join(reqs)), TESTDIR, 0) | |
604 | proc.communicate() |
|
605 | proc.communicate() | |
605 | ret = proc.wait() |
|
606 | ret = proc.wait() | |
606 | if wifexited(ret): |
|
607 | if wifexited(ret): | |
@@ -909,7 +910,7 b' def runone(options, test):' | |||||
909 |
|
910 | |||
910 | # Make a tmp subdirectory to work in |
|
911 | # Make a tmp subdirectory to work in | |
911 | testtmp = os.environ["TESTTMP"] = os.environ["HOME"] = \ |
|
912 | testtmp = os.environ["TESTTMP"] = os.environ["HOME"] = \ | |
912 |
os.path.join(HGTMP, os.path.basename(test)) |
|
913 | os.path.join(HGTMP, os.path.basename(test)) | |
913 |
|
914 | |||
914 | replacements = [ |
|
915 | replacements = [ | |
915 | (r':%s\b' % options.port, ':$HGPORT'), |
|
916 | (r':%s\b' % options.port, ':$HGPORT'), | |
@@ -1229,7 +1230,7 b' def main():' | |||||
1229 | del os.environ[k] |
|
1230 | del os.environ[k] | |
1230 |
|
1231 | |||
1231 | global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE |
|
1232 | global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE | |
1232 |
TESTDIR = os.environ["TESTDIR"] = os.getcwd() |
|
1233 | TESTDIR = os.environ["TESTDIR"] = os.getcwd() | |
1233 | if options.tmpdir: |
|
1234 | if options.tmpdir: | |
1234 | options.keep_tmpdir = True |
|
1235 | options.keep_tmpdir = True | |
1235 | tmpdir = options.tmpdir |
|
1236 | tmpdir = options.tmpdir |
@@ -332,7 +332,7 b' Test hg-ssh in read-only mode:' | |||||
332 | $ echo "baz" > bar |
|
332 | $ echo "baz" > bar | |
333 | $ hg ci -A -m "unpushable commit" bar |
|
333 | $ hg ci -A -m "unpushable commit" bar | |
334 | $ hg push --ssh "sh ../ssh.sh" |
|
334 | $ hg push --ssh "sh ../ssh.sh" | |
335 |
pushing to ssh://user@dummy/ |
|
335 | pushing to ssh://user@dummy/*/remote (glob) | |
336 | searching for changes |
|
336 | searching for changes | |
337 | remote: Permission denied |
|
337 | remote: Permission denied | |
338 | remote: abort: prechangegroup.hg-ssh hook failed |
|
338 | remote: abort: prechangegroup.hg-ssh hook failed |
General Comments 0
You need to be logged in to leave comments.
Login now