From f33d6c4e6592d1c4575fcf02aa3ffa60589f92db Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Mon, 24 Mar 2014 21:41:56 -0700 Subject: [PATCH] run-tests: use return values instead of sys.exit --- tests/run-tests.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/run-tests.py b/tests/run-tests.py index d1809ddbb8..b8f3b80792 100755 --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -1228,7 +1228,8 @@ def main(args): # Meaning of tmpdir has changed since 1.3: we used to create # HGTMP inside tmpdir; now HGTMP is tmpdir. So fail if # tmpdir already exists. - sys.exit("error: temp dir %r already exists" % tmpdir) + print "error: temp dir %r already exists" % tmpdir + return 1 # Automatically removing tmpdir sounds convenient, but could # really annoy anyone in the habit of using "--tmpdir=/tmp" @@ -1293,10 +1294,10 @@ def main(args): vlog("# Using", IMPL_PATH, os.environ[IMPL_PATH]) try: - sys.exit(runtests(options, tests) or 0) + return runtests(options, tests) or 0 finally: time.sleep(.1) cleanup(options) if __name__ == '__main__': - main(sys.argv[1:]) + sys.exit(main(sys.argv[1:]))