equal
deleted
inserted
replaced
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 tdir = TESTDIR.replace('\\', '/') |
603 proc = Popen4('%s -c "%s/hghave %s"' % |
603 proc = Popen4('%s -c "%s/hghave %s"' % |
604 (options.shell, tdir, ' '.join(reqs)), wd, 0) |
604 (options.shell, tdir, ' '.join(reqs)), wd, 0) |
605 proc.communicate() |
605 stdout, stderr = proc.communicate() |
606 ret = proc.wait() |
606 ret = proc.wait() |
607 if wifexited(ret): |
607 if wifexited(ret): |
608 ret = os.WEXITSTATUS(ret) |
608 ret = os.WEXITSTATUS(ret) |
|
609 if ret == 2: |
|
610 print stdout |
|
611 sys.exit(1) |
609 return ret == 0 |
612 return ret == 0 |
610 |
613 |
611 f = open(test) |
614 f = open(test) |
612 t = f.readlines() |
615 t = f.readlines() |
613 f.close() |
616 f.close() |