mercurial-crew-with-dirclash: tests/run-tests.py annotate

annotate tests/run-tests.py @ 2439:e8c4f3d3df8c

extend network protocol to stop clients from locking servers now all repositories have capabilities slot, tuple with list of names. if 'unbundle' capability present, repo supports push where client does not need to lock server. repository classes that have unbundle capability also have unbundle method. implemented for ssh now, will be base for push over http. unbundle protocol acts this way. server tells client what heads it has during normal negotiate step. client starts unbundle by repeat server's heads back to it. if server has new heads, abort immediately. otherwise, transfer changes to server. once data transferred, server locks and checks heads again. if heads same, changes can be added. else someone else added heads, and server aborts. if client wants to force server to add heads, sends special heads list of 'force'.

author	Vadim Gelfer <vadim.gelfer@gmail.com>
date	Thu, 15 Jun 2006 16:37:23 -0700
parents	4068d6a7a99e
children	2264b2b077a1

rev	line source
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	1 #!/usr/bin/env python
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	2 #
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	3 # run-tests.py - Run a set of tests on Mercurial
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	4 #
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	5 # Copyright 2006 Matt Mackall <mpm@selenic.com>
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	6 #
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	7 # This software may be used and distributed according to the terms
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	8 # of the GNU General Public License, incorporated herein by reference.
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	9
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	10 import os, sys, shutil, re
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	11 import tempfile
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	12 import difflib
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	13 import popen2
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	14 from optparse import OptionParser
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	15
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	16 required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"]
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	17
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	18 parser = OptionParser("%prog [options] [tests]")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	19 parser.add_option("-v", "--verbose", action="store_true",
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	20 help="output verbose messages")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	21 parser.add_option("-c", "--cover", action="store_true",
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	22 help="print a test coverage report")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	23 parser.add_option("-s", "--cover_stdlib", action="store_true",
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	24 help="print a test coverage report inc. standard libraries")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	25 parser.add_option("-C", "--annotate", action="store_true",
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	26 help="output files annotated with coverage")
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	27 (options, args) = parser.parse_args()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	28 verbose = options.verbose
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	29 coverage = options.cover or options.cover_stdlib or options.annotate
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	30
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	31 def vlog(*msg):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	32 if verbose:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	33 for m in msg:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	34 print m,
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	35 print
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	36
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	37 def splitnewlines(text):
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	38 '''like str.splitlines, but only split on newlines.
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	39 keep line endings.'''
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	40 i = 0
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	41 lines = []
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	42 while True:
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	43 n = text.find('\n', i)
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	44 if n == -1:
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	45 last = text[i:]
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	46 if last:
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	47 lines.append(last)
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	48 return lines
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	49 lines.append(text[i:n+1])
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	50 i = n + 1
546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	51
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	52 def show_diff(expected, output):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	53 for line in difflib.unified_diff(expected, output,
2409 4068d6a7a99e Fix diff header (line endings) for failed test output in run-tests.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 2408 diff changeset	54 "Expected output", "Test output"):
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	55 sys.stdout.write(line)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	56
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	57 def find_program(program):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	58 """Search PATH for a executable program"""
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	59 for p in os.environ.get('PATH', os.defpath).split(os.pathsep):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	60 name = os.path.join(p, program)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	61 if os.access(name, os.X_OK):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	62 return name
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	63 return None
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	64
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	65 def check_required_tools():
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	66 # Before we go any further, check for pre-requisite tools
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	67 # stuff from coreutils (cat, rm, etc) are not tested
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	68 for p in required_tools:
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	69 if os.name == 'nt':
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	70 p += '.exe'
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	71 found = find_program(p)
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	72 if found:
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	73 vlog("# Found prerequisite", p, "at", found)
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	74 else:
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	75 print "WARNING: Did not find prerequisite tool: "+p
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	76
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	77 def cleanup_exit():
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	78 if verbose:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	79 print "# Cleaning up HGTMP", HGTMP
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	80 shutil.rmtree(HGTMP, True)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	81
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	82 def install_hg():
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	83 vlog("# Performing temporary installation of HG")
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	84 installerrs = os.path.join("tests", "install.err")
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	85
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	86 os.chdir("..") # Get back to hg root
2183 a56fc34d6e23 Always clean the build directory before installing for running the tests. Thomas Arendsen Hein <thomas@intevation.de> parents: 2146 diff changeset	87 cmd = ('%s setup.py clean --all'
a56fc34d6e23 Always clean the build directory before installing for running the tests. Thomas Arendsen Hein <thomas@intevation.de> parents: 2146 diff changeset	88 ' install --force --home="%s" --install-lib="%s" >%s 2>&1'
a56fc34d6e23 Always clean the build directory before installing for running the tests. Thomas Arendsen Hein <thomas@intevation.de> parents: 2146 diff changeset	89 % (sys.executable, INST, PYTHONDIR, installerrs))
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	90 vlog("# Running", cmd)
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	91 if os.system(cmd) == 0:
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	92 if not verbose:
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	93 os.remove(installerrs)
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	94 else:
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	95 f = open(installerrs)
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	96 for line in f:
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	97 print line,
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	98 f.close()
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	99 sys.exit(1)
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	100 os.chdir(TESTDIR)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	101
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	102 os.environ["PATH"] = "%s%s%s" % (BINDIR, os.pathsep, os.environ["PATH"])
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	103 os.environ["PYTHONPATH"] = PYTHONDIR
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	104
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	105 if coverage:
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	106 vlog("# Installing coverage wrapper")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	107 os.environ['COVERAGE_FILE'] = COVERAGE_FILE
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	108 if os.path.exists(COVERAGE_FILE):
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	109 os.unlink(COVERAGE_FILE)
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	110 # Create a wrapper script to invoke hg via coverage.py
2146 eb1ed410aa34 run-tests.py: remove trailing white space Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2145 diff changeset	111 os.rename(os.path.join(BINDIR, "hg"), os.path.join(BINDIR, "_hg.py"))
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	112 f = open(os.path.join(BINDIR, 'hg'), 'w')
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	113 f.write('#!' + sys.executable + '\n')
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	114 f.write('import sys, os; os.execv(sys.executable, [sys.executable, '+ \
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	115 '"%s", "-x", "%s"] + sys.argv[1:])\n' % (
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	116 os.path.join(TESTDIR, 'coverage.py'),
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	117 os.path.join(BINDIR, '_hg.py')))
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	118 f.close()
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	119 os.chmod(os.path.join(BINDIR, 'hg'), 0700)
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	120
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	121 def output_coverage():
2145 5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	122 vlog("# Producing coverage report")
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	123 omit = [BINDIR, TESTDIR, PYTHONDIR]
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	124 if not options.cover_stdlib:
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	125 # Exclude as system paths (ignoring empty strings seen on win)
2146 eb1ed410aa34 run-tests.py: remove trailing white space Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2145 diff changeset	126 omit += [x for x in sys.path if x != '']
2145 5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	127 omit = ','.join(omit)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	128 os.chdir(PYTHONDIR)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	129 cmd = '"%s" "%s" -r "--omit=%s"' % (
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	130 sys.executable, os.path.join(TESTDIR, 'coverage.py'), omit)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	131 vlog("# Running: "+cmd)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	132 os.system(cmd)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	133 if options.annotate:
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	134 adir = os.path.join(TESTDIR, 'annotated')
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	135 if not os.path.isdir(adir):
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	136 os.mkdir(adir)
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	137 cmd = '"%s" "%s" -a "--directory=%s" "--omit=%s"' % (
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	138 sys.executable, os.path.join(TESTDIR, 'coverage.py'),
5bb3cb9e5d13 make indentation of coverage code in run-tests.py nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2144 diff changeset	139 adir, omit)
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	140 vlog("# Running: "+cmd)
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	141 os.system(cmd)
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	142
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	143 def run(cmd):
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	144 """Run command in a sub-process, capturing the output (stdout and stderr).
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	145 Return the exist code, and output."""
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	146 # TODO: Use subprocess.Popen if we're running on Python 2.4
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	147 if os.name == 'nt':
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	148 tochild, fromchild = os.popen4(cmd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	149 tochild.close()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	150 output = fromchild.read()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	151 ret = fromchild.close()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	152 if ret == None:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	153 ret = 0
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	154 else:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	155 proc = popen2.Popen4(cmd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	156 proc.tochild.close()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	157 output = proc.fromchild.read()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	158 ret = proc.wait()
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	159 return ret, splitnewlines(output)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	160
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	161 def run_one(test):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	162 vlog("# Test", test)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	163 if not verbose:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	164 sys.stdout.write('.')
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	165 sys.stdout.flush()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	166
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	167 err = os.path.join(TESTDIR, test+".err")
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	168 ref = os.path.join(TESTDIR, test+".out")
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	169
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	170 if os.path.exists(err):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	171 os.remove(err) # Remove any previous output files
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	172
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	173 # Make a tmp subdirectory to work in
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	174 tmpd = os.path.join(HGTMP, test)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	175 os.mkdir(tmpd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	176 os.chdir(tmpd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	177
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	178 if test.endswith(".py"):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	179 cmd = '%s "%s"' % (sys.executable, os.path.join(TESTDIR, test))
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	180 else:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	181 cmd = '"%s"' % (os.path.join(TESTDIR, test))
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	182
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	183 # To reliably get the error code from batch files on WinXP,
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	184 # the "cmd /c call" prefix is needed. Grrr
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	185 if os.name == 'nt' and test.endswith(".bat"):
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	186 cmd = 'cmd /c call "%s"' % (os.path.join(TESTDIR, test))
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	187
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	188 vlog("# Running", cmd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	189 ret, out = run(cmd)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	190 vlog("# Ret was:", ret)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	191
2213 6f76a479ae51 run-tests.py must print changed test output no matter what exit code is. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2183 diff changeset	192 diffret = 0
6f76a479ae51 run-tests.py must print changed test output no matter what exit code is. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2183 diff changeset	193 # If reference output file exists, check test output against it
6f76a479ae51 run-tests.py must print changed test output no matter what exit code is. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2183 diff changeset	194 if os.path.exists(ref):
6f76a479ae51 run-tests.py must print changed test output no matter what exit code is. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2183 diff changeset	195 f = open(ref, "r")
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	196 ref_out = splitnewlines(f.read())
2213 6f76a479ae51 run-tests.py must print changed test output no matter what exit code is. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2183 diff changeset	197 f.close()
2246 3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	198 else:
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	199 ref_out = ['']
2246 3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	200 if out != ref_out:
3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	201 diffret = 1
3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	202 print "\nERROR: %s output changed" % (test)
3fd603eb6add run-tests.py: print diff if reference output not existing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2213 diff changeset	203 show_diff(ref_out, out)
2213 6f76a479ae51 run-tests.py must print changed test output no matter what exit code is. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2183 diff changeset	204 if ret:
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	205 print "\nERROR: %s failed with error code %d" % (test, ret)
2213 6f76a479ae51 run-tests.py must print changed test output no matter what exit code is. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2183 diff changeset	206 elif diffret:
6f76a479ae51 run-tests.py must print changed test output no matter what exit code is. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2183 diff changeset	207 ret = diffret
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	208
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	209 if ret != 0: # Save errors to a file for diagnosis
2247 546c76e5a3e6 run-tests.py: fix handling of newlines. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2246 diff changeset	210 f = open(err, "wb")
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	211 for line in out:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	212 f.write(line)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	213 f.close()
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	214
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	215 os.chdir(TESTDIR)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	216 shutil.rmtree(tmpd, True)
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	217 return ret == 0
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	218
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	219
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	220 os.umask(022)
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	221
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	222 check_required_tools()
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	223
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	224 # Reset some environment variables to well-known values so that
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	225 # the tests produce repeatable output.
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	226 os.environ['LANG'] = os.environ['LC_ALL'] = 'C'
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	227 os.environ['TZ'] = 'GMT'
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	228
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	229 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	230 os.environ["HGMERGE"] = sys.executable + ' -c "import sys; sys.exit(0)"'
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	231 os.environ["HGUSER"] = "test"
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	232 os.environ["HGRCPATH"] = ""
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	233
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	234 TESTDIR = os.environ["TESTDIR"] = os.getcwd()
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	235 HGTMP = os.environ["HGTMP"] = tempfile.mkdtemp("", "hgtests.")
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	236 vlog("# Using TESTDIR", TESTDIR)
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	237 vlog("# Using HGTMP", HGTMP)
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	238
2144 d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	239 INST = os.path.join(HGTMP, "install")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	240 BINDIR = os.path.join(INST, "bin")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	241 PYTHONDIR = os.path.join(INST, "lib", "python")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	242 COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
d3bddedfdbd0 Add code coverage to the python version of run-tests (inc. annotation) Stephen Darnell <stephen@darnell.plus.com> parents: 2133 diff changeset	243
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	244 try:
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	245 try:
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	246 install_hg()
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	247
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	248 tests = 0
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	249 failed = 0
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	250
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	251 if len(args) == 0:
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	252 args = os.listdir(".")
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	253 for test in args:
2408 6ed46bad9530 Don't run tests with dots in their name (e.g. test-foo.orig) Thomas Arendsen Hein <thomas@intevation.de> parents: 2258 diff changeset	254 if test.startswith("test-") and not '~' in test and not '.' in test:
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	255 if not run_one(test):
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	256 failed += 1
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	257 tests += 1
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	258
2258 7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	259 print "\n# Ran %d tests, %d failed." % (tests, failed)
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	260 if coverage:
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	261 output_coverage()
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	262 except KeyboardInterrupt:
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	263 failed = True
7e43d68f3900 catch KeyboardInterrupt in run-tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2247 diff changeset	264 print "\ninterrupted!"
2133 4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	265 finally:
4334be196f8d Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line Stephen Darnell <stephen@darnell.plus.com> parents: 2110 diff changeset	266 cleanup_exit()
2110 25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	267
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	268 if failed:
25a8d116ab6a Add a pure python version of run-tests. Stephen Darnell <stephen@darnell.plus.com> parents: diff changeset	269 sys.exit(1)

Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/run-tests.py @ 2439:e8c4f3d3df8c