##// END OF EJS Templates
tests: make hghave and run-tests exit on unknown feature requirements
Mads Kiilerich -
r18229:77d06793 default
parent child Browse files
Show More
@@ -59,7 +59,7 b" if __name__ == '__main__':"
59
59
60 if feature not in checks:
60 if feature not in checks:
61 error('skipped: unknown feature: ' + feature)
61 error('skipped: unknown feature: ' + feature)
62 continue
62 sys.exit(2)
63
63
64 check, desc = checks[feature]
64 check, desc = checks[feature]
65 try:
65 try:
@@ -602,10 +602,13 b' def tsttest(test, wd, options, replaceme'
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)
General Comments 0
You need to be logged in to leave comments. Login now