author | Christian Ebert <blacktrash@gmx.net> |
Thu, 10 Mar 2011 22:02:02 +0100 | |
changeset 889 | 1fb7ab079d11 |
parent 882 | c3681742c0c7 |
child 895 | 1a9cd0b534a0 |
permissions | -rwxr-xr-x |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1 |
#!/usr/bin/env python |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
2 |
# |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
3 |
# run-tests.py - Run a set of tests on Mercurial |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
4 |
# |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
5 |
# Copyright 2006 Matt Mackall <mpm@selenic.com> |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
6 |
# |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
7 |
# This software may be used and distributed according to the terms of the |
674 | 8 |
# GNU General Public License version 2 or any later version. |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
9 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
10 |
# Modifying this script is tricky because it has many modes: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
11 |
# - serial (default) vs parallel (-jN, N > 1) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
12 |
# - no coverage (default) vs coverage (-c, -C, -s) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
13 |
# - temp install (default) vs specific hg script (--with-hg, --local) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
14 |
# - tests are a mix of shell scripts and Python scripts |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
15 |
# |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
16 |
# If you change this script, it is recommended that you ensure you |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
17 |
# haven't broken it by running it in various modes with a representative |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
18 |
# sample of test scripts. For example: |
670 | 19 |
# |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
20 |
# 1) serial, no coverage, temp install: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
21 |
# ./run-tests.py test-s* |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
22 |
# 2) serial, no coverage, local hg: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
23 |
# ./run-tests.py --local test-s* |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
24 |
# 3) serial, coverage, temp install: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
25 |
# ./run-tests.py -c test-s* |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
26 |
# 4) serial, coverage, local hg: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
27 |
# ./run-tests.py -c --local test-s* # unsupported |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
28 |
# 5) parallel, no coverage, temp install: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
29 |
# ./run-tests.py -j2 test-s* |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
30 |
# 6) parallel, no coverage, local hg: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
31 |
# ./run-tests.py -j2 --local test-s* |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
32 |
# 7) parallel, coverage, temp install: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
33 |
# ./run-tests.py -j2 -c test-s* # currently broken |
670 | 34 |
# 8) parallel, coverage, local install: |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
35 |
# ./run-tests.py -j2 -c --local test-s* # unsupported (and broken) |
670 | 36 |
# 9) parallel, custom tmp dir: |
37 |
# ./run-tests.py -j2 --tmpdir /tmp/myhgtests |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
38 |
# |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
39 |
# (You could use any subset of the tests: test-s* happens to match |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
40 |
# enough that it's worth doing parallel runs, few enough that it |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
41 |
# completes fairly quickly, includes both shell and Python scripts, and |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
42 |
# includes some scripts that run daemon processes.) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
43 |
|
718
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
44 |
from distutils import version |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
45 |
import difflib |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
46 |
import errno |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
47 |
import optparse |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
48 |
import os |
726
f7050b041b5f
pylint, pyflakes: remove unused or duplicate imports
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
725
diff
changeset
|
49 |
import shutil |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
50 |
import subprocess |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
51 |
import signal |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
52 |
import sys |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
53 |
import tempfile |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
54 |
import time |
776
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
55 |
import re |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
56 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
57 |
closefds = os.name == 'posix' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
58 |
def Popen4(cmd, bufsize=-1): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
59 |
p = subprocess.Popen(cmd, shell=True, bufsize=bufsize, |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
60 |
close_fds=closefds, |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
61 |
stdin=subprocess.PIPE, stdout=subprocess.PIPE, |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
62 |
stderr=subprocess.STDOUT) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
63 |
p.fromchild = p.stdout |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
64 |
p.tochild = p.stdin |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
65 |
p.childerr = p.stderr |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
66 |
return p |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
67 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
68 |
# reserved exit code to skip test (used by hghave) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
69 |
SKIPPED_STATUS = 80 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
70 |
SKIPPED_PREFIX = 'skipped: ' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
71 |
FAILED_PREFIX = 'hghave check failed: ' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
72 |
PYTHON = sys.executable |
720
8008f7627b2f
tests: adapt the test runner to work with jython
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
719
diff
changeset
|
73 |
IMPL_PATH = 'PYTHONPATH' |
8008f7627b2f
tests: adapt the test runner to work with jython
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
719
diff
changeset
|
74 |
if 'java' in sys.platform: |
8008f7627b2f
tests: adapt the test runner to work with jython
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
719
diff
changeset
|
75 |
IMPL_PATH = 'JYTHONPATH' |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
76 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
77 |
requiredtools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
78 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
79 |
defaults = { |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
80 |
'jobs': ('HGTEST_JOBS', 1), |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
81 |
'timeout': ('HGTEST_TIMEOUT', 180), |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
82 |
'port': ('HGTEST_PORT', 20059), |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
83 |
} |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
84 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
85 |
def parseargs(): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
86 |
parser = optparse.OptionParser("%prog [options] [tests]") |
740 | 87 |
|
88 |
# keep these sorted |
|
89 |
parser.add_option("--blacklist", action="append", |
|
90 |
help="skip tests listed in the specified blacklist file") |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
91 |
parser.add_option("-C", "--annotate", action="store_true", |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
92 |
help="output files annotated with coverage") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
93 |
parser.add_option("--child", type="int", |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
94 |
help="run as child process, summary to given fd") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
95 |
parser.add_option("-c", "--cover", action="store_true", |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
96 |
help="print a test coverage report") |
740 | 97 |
parser.add_option("-d", "--debug", action="store_true", |
98 |
help="debug mode: write output of test scripts to console" |
|
99 |
" rather than capturing and diff'ing it (disables timeout)") |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
100 |
parser.add_option("-f", "--first", action="store_true", |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
101 |
help="exit on the first test failure") |
740 | 102 |
parser.add_option("--inotify", action="store_true", |
103 |
help="enable inotify extension when running tests") |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
104 |
parser.add_option("-i", "--interactive", action="store_true", |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
105 |
help="prompt to accept changed output") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
106 |
parser.add_option("-j", "--jobs", type="int", |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
107 |
help="number of jobs to run in parallel" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
108 |
" (default: $%s or %d)" % defaults['jobs']) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
109 |
parser.add_option("--keep-tmpdir", action="store_true", |
670 | 110 |
help="keep temporary directory after running tests") |
740 | 111 |
parser.add_option("-k", "--keywords", |
112 |
help="run tests matching keywords") |
|
113 |
parser.add_option("-l", "--local", action="store_true", |
|
114 |
help="shortcut for --with-hg=<testdir>/../hg") |
|
115 |
parser.add_option("-n", "--nodiff", action="store_true", |
|
116 |
help="skip showing test changes") |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
117 |
parser.add_option("-p", "--port", type="int", |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
118 |
help="port on which servers should listen" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
119 |
" (default: $%s or %d)" % defaults['port']) |
740 | 120 |
parser.add_option("--pure", action="store_true", |
121 |
help="use pure Python code instead of C extensions") |
|
122 |
parser.add_option("-R", "--restart", action="store_true", |
|
123 |
help="restart at last error") |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
124 |
parser.add_option("-r", "--retest", action="store_true", |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
125 |
help="retest failed tests") |
670 | 126 |
parser.add_option("-S", "--noskips", action="store_true", |
127 |
help="don't report skip tests verbosely") |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
128 |
parser.add_option("-t", "--timeout", type="int", |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
129 |
help="kill errant tests after TIMEOUT seconds" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
130 |
" (default: $%s or %d)" % defaults['timeout']) |
740 | 131 |
parser.add_option("--tmpdir", type="string", |
132 |
help="run tests in the given temporary directory" |
|
133 |
" (implies --keep-tmpdir)") |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
134 |
parser.add_option("-v", "--verbose", action="store_true", |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
135 |
help="output verbose messages") |
741
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
136 |
parser.add_option("--view", type="string", |
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
137 |
help="external diff viewer") |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
138 |
parser.add_option("--with-hg", type="string", |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
139 |
metavar="HG", |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
140 |
help="test using specified hg script rather than a " |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
141 |
"temporary installation") |
670 | 142 |
parser.add_option("-3", "--py3k-warnings", action="store_true", |
143 |
help="enable Py3k warnings on Python 2.6+") |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
144 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
145 |
for option, default in defaults.items(): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
146 |
defaults[option] = int(os.environ.get(*default)) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
147 |
parser.set_defaults(**defaults) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
148 |
(options, args) = parser.parse_args() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
149 |
|
720
8008f7627b2f
tests: adapt the test runner to work with jython
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
719
diff
changeset
|
150 |
# jython is always pure |
722
85da4926cf39
run-tests: force to test pure on pypy as well
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
721
diff
changeset
|
151 |
if 'java' in sys.platform or '__pypy__' in sys.modules: |
721
1dbc96b10ebd
Fix run-tests.py -jX after 2ed667a9dfcb
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
720
diff
changeset
|
152 |
options.pure = True |
720
8008f7627b2f
tests: adapt the test runner to work with jython
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
719
diff
changeset
|
153 |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
154 |
if options.with_hg: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
155 |
if not (os.path.isfile(options.with_hg) and |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
156 |
os.access(options.with_hg, os.X_OK)): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
157 |
parser.error('--with-hg must specify an executable hg script') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
158 |
if not os.path.basename(options.with_hg) == 'hg': |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
159 |
sys.stderr.write('warning: --with-hg should specify an hg script') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
160 |
if options.local: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
161 |
testdir = os.path.dirname(os.path.realpath(sys.argv[0])) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
162 |
hgbin = os.path.join(os.path.dirname(testdir), 'hg') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
163 |
if not os.access(hgbin, os.X_OK): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
164 |
parser.error('--local specified, but %r not found or not executable' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
165 |
% hgbin) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
166 |
options.with_hg = hgbin |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
167 |
|
718
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
168 |
options.anycoverage = options.cover or options.annotate |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
169 |
if options.anycoverage: |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
170 |
try: |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
171 |
import coverage |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
172 |
covver = version.StrictVersion(coverage.__version__).version |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
173 |
if covver < (3, 3): |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
174 |
parser.error('coverage options require coverage 3.3 or later') |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
175 |
except ImportError: |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
176 |
parser.error('coverage options now require the coverage package') |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
177 |
|
718
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
178 |
if options.anycoverage and options.local: |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
179 |
# this needs some path mangling somewhere, I guess |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
180 |
parser.error("sorry, coverage options do not work when --local " |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
181 |
"is specified") |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
182 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
183 |
global vlog |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
184 |
if options.verbose: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
185 |
if options.jobs > 1 or options.child is not None: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
186 |
pid = "[%d]" % os.getpid() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
187 |
else: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
188 |
pid = None |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
189 |
def vlog(*msg): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
190 |
if pid: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
191 |
print pid, |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
192 |
for m in msg: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
193 |
print m, |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
194 |
print |
670 | 195 |
sys.stdout.flush() |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
196 |
else: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
197 |
vlog = lambda *msg: None |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
198 |
|
670 | 199 |
if options.tmpdir: |
200 |
options.tmpdir = os.path.expanduser(options.tmpdir) |
|
201 |
||
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
202 |
if options.jobs < 1: |
670 | 203 |
parser.error('--jobs must be positive') |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
204 |
if options.interactive and options.jobs > 1: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
205 |
print '(--interactive overrides --jobs)' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
206 |
options.jobs = 1 |
670 | 207 |
if options.interactive and options.debug: |
208 |
parser.error("-i/--interactive and -d/--debug are incompatible") |
|
209 |
if options.debug: |
|
210 |
if options.timeout != defaults['timeout']: |
|
211 |
sys.stderr.write( |
|
212 |
'warning: --timeout option ignored with --debug\n') |
|
213 |
options.timeout = 0 |
|
214 |
if options.py3k_warnings: |
|
215 |
if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0): |
|
216 |
parser.error('--py3k-warnings can only be used on Python 2.6+') |
|
217 |
if options.blacklist: |
|
218 |
blacklist = dict() |
|
681
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
219 |
for filename in options.blacklist: |
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
220 |
try: |
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
221 |
path = os.path.expanduser(os.path.expandvars(filename)) |
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
222 |
f = open(path, "r") |
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
223 |
except IOError, err: |
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
224 |
if err.errno != errno.ENOENT: |
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
225 |
raise |
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
226 |
print "warning: no such blacklist file: %s" % filename |
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
227 |
continue |
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
228 |
|
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
229 |
for line in f.readlines(): |
882
c3681742c0c7
run-tests: handle mixed comment lines in blacklists
Patrick Mezard <pmezard@gmail.com>
parents:
880
diff
changeset
|
230 |
line = line.split('#', 1)[0].strip() |
c3681742c0c7
run-tests: handle mixed comment lines in blacklists
Patrick Mezard <pmezard@gmail.com>
parents:
880
diff
changeset
|
231 |
if line: |
681
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
232 |
blacklist[line] = filename |
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
233 |
|
880
0b9f0c42b566
explicitly close files
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
878
diff
changeset
|
234 |
f.close() |
0b9f0c42b566
explicitly close files
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
878
diff
changeset
|
235 |
|
670 | 236 |
options.blacklist = blacklist |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
237 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
238 |
return (options, args) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
239 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
240 |
def rename(src, dst): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
241 |
"""Like os.rename(), trade atomicity and opened files friendliness |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
242 |
for existing destination support. |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
243 |
""" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
244 |
shutil.copy(src, dst) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
245 |
os.remove(src) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
246 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
247 |
def splitnewlines(text): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
248 |
'''like str.splitlines, but only split on newlines. |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
249 |
keep line endings.''' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
250 |
i = 0 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
251 |
lines = [] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
252 |
while True: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
253 |
n = text.find('\n', i) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
254 |
if n == -1: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
255 |
last = text[i:] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
256 |
if last: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
257 |
lines.append(last) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
258 |
return lines |
680
f10a5301d082
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
674
diff
changeset
|
259 |
lines.append(text[i:n + 1]) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
260 |
i = n + 1 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
261 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
262 |
def parsehghaveoutput(lines): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
263 |
'''Parse hghave log lines. |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
264 |
Return tuple of lists (missing, failed): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
265 |
* the missing/unknown features |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
266 |
* the features for which existence check failed''' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
267 |
missing = [] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
268 |
failed = [] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
269 |
for line in lines: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
270 |
if line.startswith(SKIPPED_PREFIX): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
271 |
line = line.splitlines()[0] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
272 |
missing.append(line[len(SKIPPED_PREFIX):]) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
273 |
elif line.startswith(FAILED_PREFIX): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
274 |
line = line.splitlines()[0] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
275 |
failed.append(line[len(FAILED_PREFIX):]) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
276 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
277 |
return missing, failed |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
278 |
|
670 | 279 |
def showdiff(expected, output, ref, err): |
280 |
for line in difflib.unified_diff(expected, output, ref, err): |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
281 |
sys.stdout.write(line) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
282 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
283 |
def findprogram(program): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
284 |
"""Search PATH for a executable program""" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
285 |
for p in os.environ.get('PATH', os.defpath).split(os.pathsep): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
286 |
name = os.path.join(p, program) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
287 |
if os.access(name, os.X_OK): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
288 |
return name |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
289 |
return None |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
290 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
291 |
def checktools(): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
292 |
# Before we go any further, check for pre-requisite tools |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
293 |
# stuff from coreutils (cat, rm, etc) are not tested |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
294 |
for p in requiredtools: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
295 |
if os.name == 'nt': |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
296 |
p += '.exe' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
297 |
found = findprogram(p) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
298 |
if found: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
299 |
vlog("# Found prerequisite", p, "at", found) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
300 |
else: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
301 |
print "WARNING: Did not find prerequisite tool: "+p |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
302 |
|
682
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
303 |
def killdaemons(): |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
304 |
# Kill off any leftover daemon processes |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
305 |
try: |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
306 |
fp = open(DAEMON_PIDS) |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
307 |
for line in fp: |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
308 |
try: |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
309 |
pid = int(line) |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
310 |
except ValueError: |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
311 |
continue |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
312 |
try: |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
313 |
os.kill(pid, 0) |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
314 |
vlog('# Killing daemon process %d' % pid) |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
315 |
os.kill(pid, signal.SIGTERM) |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
316 |
time.sleep(0.25) |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
317 |
os.kill(pid, 0) |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
318 |
vlog('# Daemon process %d is stuck - really killing it' % pid) |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
319 |
os.kill(pid, signal.SIGKILL) |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
320 |
except OSError, err: |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
321 |
if err.errno != errno.ESRCH: |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
322 |
raise |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
323 |
fp.close() |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
324 |
os.unlink(DAEMON_PIDS) |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
325 |
except IOError: |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
326 |
pass |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
327 |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
328 |
def cleanup(options): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
329 |
if not options.keep_tmpdir: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
330 |
vlog("# Cleaning up HGTMP", HGTMP) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
331 |
shutil.rmtree(HGTMP, True) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
332 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
333 |
def usecorrectpython(): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
334 |
# some tests run python interpreter. they must use same |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
335 |
# interpreter we use or bad things will happen. |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
336 |
exedir, exename = os.path.split(sys.executable) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
337 |
if exename == 'python': |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
338 |
path = findprogram('python') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
339 |
if os.path.dirname(path) == exedir: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
340 |
return |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
341 |
vlog('# Making python executable in test path use correct Python') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
342 |
mypython = os.path.join(BINDIR, 'python') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
343 |
try: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
344 |
os.symlink(sys.executable, mypython) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
345 |
except AttributeError: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
346 |
# windows fallback |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
347 |
shutil.copyfile(sys.executable, mypython) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
348 |
shutil.copymode(sys.executable, mypython) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
349 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
350 |
def installhg(options): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
351 |
vlog("# Performing temporary installation of HG") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
352 |
installerrs = os.path.join("tests", "install.err") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
353 |
pure = options.pure and "--pure" or "" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
354 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
355 |
# Run installer in hg root |
670 | 356 |
script = os.path.realpath(sys.argv[0]) |
357 |
hgroot = os.path.dirname(os.path.dirname(script)) |
|
358 |
os.chdir(hgroot) |
|
359 |
nohome = '--home=""' |
|
360 |
if os.name == 'nt': |
|
361 |
# The --home="" trick works only on OS where os.sep == '/' |
|
362 |
# because of a distutils convert_path() fast-path. Avoid it at |
|
363 |
# least on Windows for now, deal with .pydistutils.cfg bugs |
|
364 |
# when they happen. |
|
365 |
nohome = '' |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
366 |
cmd = ('%s setup.py %s clean --all' |
822
842e2c76e64b
run-tests: move build/ directory to HGTMP
Martin Geisler <mg@lazybytes.net>
parents:
802
diff
changeset
|
367 |
' build --build-base="%s"' |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
368 |
' install --force --prefix="%s" --install-lib="%s"' |
670 | 369 |
' --install-scripts="%s" %s >%s 2>&1' |
822
842e2c76e64b
run-tests: move build/ directory to HGTMP
Martin Geisler <mg@lazybytes.net>
parents:
802
diff
changeset
|
370 |
% (sys.executable, pure, os.path.join(HGTMP, "build"), |
842e2c76e64b
run-tests: move build/ directory to HGTMP
Martin Geisler <mg@lazybytes.net>
parents:
802
diff
changeset
|
371 |
INST, PYTHONDIR, BINDIR, nohome, installerrs)) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
372 |
vlog("# Running", cmd) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
373 |
if os.system(cmd) == 0: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
374 |
if not options.verbose: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
375 |
os.remove(installerrs) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
376 |
else: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
377 |
f = open(installerrs) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
378 |
for line in f: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
379 |
print line, |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
380 |
f.close() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
381 |
sys.exit(1) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
382 |
os.chdir(TESTDIR) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
383 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
384 |
usecorrectpython() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
385 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
386 |
vlog("# Installing dummy diffstat") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
387 |
f = open(os.path.join(BINDIR, 'diffstat'), 'w') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
388 |
f.write('#!' + sys.executable + '\n' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
389 |
'import sys\n' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
390 |
'files = 0\n' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
391 |
'for line in sys.stdin:\n' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
392 |
' if line.startswith("diff "):\n' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
393 |
' files += 1\n' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
394 |
'sys.stdout.write("files patched: %d\\n" % files)\n') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
395 |
f.close() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
396 |
os.chmod(os.path.join(BINDIR, 'diffstat'), 0700) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
397 |
|
670 | 398 |
if options.py3k_warnings and not options.anycoverage: |
399 |
vlog("# Updating hg command to enable Py3k Warnings switch") |
|
400 |
f = open(os.path.join(BINDIR, 'hg'), 'r') |
|
401 |
lines = [line.rstrip() for line in f] |
|
402 |
lines[0] += ' -3' |
|
403 |
f.close() |
|
404 |
f = open(os.path.join(BINDIR, 'hg'), 'w') |
|
405 |
for line in lines: |
|
406 |
f.write(line + '\n') |
|
407 |
f.close() |
|
408 |
||
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
409 |
if options.anycoverage: |
718
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
410 |
custom = os.path.join(TESTDIR, 'sitecustomize.py') |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
411 |
target = os.path.join(PYTHONDIR, 'sitecustomize.py') |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
412 |
vlog('# Installing coverage trigger to %s' % target) |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
413 |
shutil.copyfile(custom, target) |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
414 |
rc = os.path.join(TESTDIR, '.coveragerc') |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
415 |
vlog('# Installing coverage rc to %s' % rc) |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
416 |
os.environ['COVERAGE_PROCESS_START'] = rc |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
417 |
fn = os.path.join(INST, '..', '.coverage') |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
418 |
os.environ['COVERAGE_FILE'] = fn |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
419 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
420 |
def outputcoverage(options): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
421 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
422 |
vlog('# Producing coverage report') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
423 |
os.chdir(PYTHONDIR) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
424 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
425 |
def covrun(*args): |
718
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
426 |
cmd = 'coverage %s' % ' '.join(args) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
427 |
vlog('# Running: %s' % cmd) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
428 |
os.system(cmd) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
429 |
|
718
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
430 |
if options.child: |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
431 |
return |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
432 |
|
718
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
433 |
covrun('-c') |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
434 |
omit = ','.join([BINDIR, TESTDIR]) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
435 |
covrun('-i', '-r', '"--omit=%s"' % omit) # report |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
436 |
if options.annotate: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
437 |
adir = os.path.join(TESTDIR, 'annotated') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
438 |
if not os.path.isdir(adir): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
439 |
os.mkdir(adir) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
440 |
covrun('-i', '-a', '"--directory=%s"' % adir, '"--omit=%s"' % omit) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
441 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
442 |
class Timeout(Exception): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
443 |
pass |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
444 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
445 |
def alarmed(signum, frame): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
446 |
raise Timeout |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
447 |
|
826
ac9b63e01e2a
tests: replace test tmp directory with $TESTTMP in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
824
diff
changeset
|
448 |
def pytest(test, options, replacements): |
775
16f4cb2900fe
tests: move script execution in runner helpers
Matt Mackall <mpm@selenic.com>
parents:
741
diff
changeset
|
449 |
py3kswitch = options.py3k_warnings and ' -3' or '' |
16f4cb2900fe
tests: move script execution in runner helpers
Matt Mackall <mpm@selenic.com>
parents:
741
diff
changeset
|
450 |
cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test) |
16f4cb2900fe
tests: move script execution in runner helpers
Matt Mackall <mpm@selenic.com>
parents:
741
diff
changeset
|
451 |
vlog("# Running", cmd) |
826
ac9b63e01e2a
tests: replace test tmp directory with $TESTTMP in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
824
diff
changeset
|
452 |
return run(cmd, options, replacements) |
775
16f4cb2900fe
tests: move script execution in runner helpers
Matt Mackall <mpm@selenic.com>
parents:
741
diff
changeset
|
453 |
|
826
ac9b63e01e2a
tests: replace test tmp directory with $TESTTMP in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
824
diff
changeset
|
454 |
def shtest(test, options, replacements): |
775
16f4cb2900fe
tests: move script execution in runner helpers
Matt Mackall <mpm@selenic.com>
parents:
741
diff
changeset
|
455 |
cmd = '"%s"' % test |
16f4cb2900fe
tests: move script execution in runner helpers
Matt Mackall <mpm@selenic.com>
parents:
741
diff
changeset
|
456 |
vlog("# Running", cmd) |
826
ac9b63e01e2a
tests: replace test tmp directory with $TESTTMP in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
824
diff
changeset
|
457 |
return run(cmd, options, replacements) |
775
16f4cb2900fe
tests: move script execution in runner helpers
Matt Mackall <mpm@selenic.com>
parents:
741
diff
changeset
|
458 |
|
858
ff1badf6ae7a
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
857
diff
changeset
|
459 |
needescape = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search |
ff1badf6ae7a
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
857
diff
changeset
|
460 |
escapesub = re.compile(r'[\x00-\x08\x0b-\x1f\\\x7f-\xff]').sub |
ff1badf6ae7a
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
857
diff
changeset
|
461 |
escapemap = dict((chr(i), r'\x%02x' % i) for i in range(256)) |
ff1badf6ae7a
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
857
diff
changeset
|
462 |
escapemap.update({'\\': '\\\\', '\r': r'\r'}) |
ff1badf6ae7a
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
857
diff
changeset
|
463 |
def escapef(m): |
ff1badf6ae7a
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
857
diff
changeset
|
464 |
return escapemap[m.group(0)] |
ff1badf6ae7a
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
857
diff
changeset
|
465 |
def stringescape(s): |
ff1badf6ae7a
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
857
diff
changeset
|
466 |
return escapesub(escapef, s) |
ff1badf6ae7a
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
857
diff
changeset
|
467 |
|
826
ac9b63e01e2a
tests: replace test tmp directory with $TESTTMP in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
824
diff
changeset
|
468 |
def tsttest(test, options, replacements): |
776
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
469 |
t = open(test) |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
470 |
out = [] |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
471 |
script = [] |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
472 |
salt = "SALT" + str(time.time()) |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
473 |
|
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
474 |
pos = prepos = -1 |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
475 |
after = {} |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
476 |
expected = {} |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
477 |
for n, l in enumerate(t): |
856
e1a5259b3d03
tests: handle .t files without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
852
diff
changeset
|
478 |
if not l.endswith('\n'): |
e1a5259b3d03
tests: handle .t files without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
852
diff
changeset
|
479 |
l += '\n' |
776
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
480 |
if l.startswith(' $ '): # commands |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
481 |
after.setdefault(pos, []).append(l) |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
482 |
prepos = pos |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
483 |
pos = n |
793
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
777
diff
changeset
|
484 |
script.append('echo %s %s $?\n' % (salt, n)) |
776
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
485 |
script.append(l[4:]) |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
486 |
elif l.startswith(' > '): # continuations |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
487 |
after.setdefault(prepos, []).append(l) |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
488 |
script.append(l[4:]) |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
489 |
elif l.startswith(' '): # results |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
490 |
# queue up a list of expected results |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
491 |
expected.setdefault(pos, []).append(l[2:]) |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
492 |
else: |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
493 |
# non-command/result - queue up for merged output |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
494 |
after.setdefault(pos, []).append(l) |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
495 |
|
880
0b9f0c42b566
explicitly close files
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
878
diff
changeset
|
496 |
t.close() |
0b9f0c42b566
explicitly close files
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
878
diff
changeset
|
497 |
|
793
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
777
diff
changeset
|
498 |
script.append('echo %s %s $?\n' % (salt, n + 1)) |
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
777
diff
changeset
|
499 |
|
776
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
500 |
fd, name = tempfile.mkstemp(suffix='hg-tst') |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
501 |
|
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
502 |
try: |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
503 |
for l in script: |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
504 |
os.write(fd, l) |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
505 |
os.close(fd) |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
506 |
|
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
507 |
cmd = '/bin/sh "%s"' % name |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
508 |
vlog("# Running", cmd) |
826
ac9b63e01e2a
tests: replace test tmp directory with $TESTTMP in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
824
diff
changeset
|
509 |
exitcode, output = run(cmd, options, replacements) |
823
ab2ba4e79bed
tests: show skip reason instead of "irrelevant" with unified tests, too
Thomas Arendsen Hein <thomas@intevation.de>
parents:
822
diff
changeset
|
510 |
# do not merge output if skipped, return hghave message instead |
862
c333552ec003
run-tests: fix --debug for .t tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
860
diff
changeset
|
511 |
# similarly, with --debug, output is None |
c333552ec003
run-tests: fix --debug for .t tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
860
diff
changeset
|
512 |
if exitcode == SKIPPED_STATUS or output is None: |
823
ab2ba4e79bed
tests: show skip reason instead of "irrelevant" with unified tests, too
Thomas Arendsen Hein <thomas@intevation.de>
parents:
822
diff
changeset
|
513 |
return exitcode, output |
776
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
514 |
finally: |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
515 |
os.remove(name) |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
516 |
|
777
cd294ce45931
tests: catch re.error if test line is not a valid regular expression
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
776
diff
changeset
|
517 |
def rematch(el, l): |
cd294ce45931
tests: catch re.error if test line is not a valid regular expression
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
776
diff
changeset
|
518 |
try: |
799
c20c12c560dd
tests: ensure regexes match to the end of the string
Brodie Rao <brodie@bitheap.org>
parents:
798
diff
changeset
|
519 |
# ensure that the regex matches to the end of the string |
c20c12c560dd
tests: ensure regexes match to the end of the string
Brodie Rao <brodie@bitheap.org>
parents:
798
diff
changeset
|
520 |
return re.match(el + r'\Z', l) |
777
cd294ce45931
tests: catch re.error if test line is not a valid regular expression
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
776
diff
changeset
|
521 |
except re.error: |
cd294ce45931
tests: catch re.error if test line is not a valid regular expression
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
776
diff
changeset
|
522 |
# el is an invalid regex |
cd294ce45931
tests: catch re.error if test line is not a valid regular expression
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
776
diff
changeset
|
523 |
return False |
cd294ce45931
tests: catch re.error if test line is not a valid regular expression
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
776
diff
changeset
|
524 |
|
801
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
525 |
def globmatch(el, l): |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
526 |
# The only supported special characters are * and ?. Escaping is |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
527 |
# supported. |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
528 |
i, n = 0, len(el) |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
529 |
res = '' |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
530 |
while i < n: |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
531 |
c = el[i] |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
532 |
i += 1 |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
533 |
if c == '\\' and el[i] in '*?\\': |
802
630d72ae4f76
tests: various fixes for new unified test pattern format
Matt Mackall <mpm@selenic.com>
parents:
801
diff
changeset
|
534 |
res += el[i - 1:i + 1] |
801
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
535 |
i += 1 |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
536 |
elif c == '*': |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
537 |
res += '.*' |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
538 |
elif c == '?': |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
539 |
res += '.' |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
540 |
else: |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
541 |
res += re.escape(c) |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
542 |
return rematch(res, l) |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
543 |
|
776
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
544 |
pos = -1 |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
545 |
postout = [] |
793
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
777
diff
changeset
|
546 |
ret = 0 |
776
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
547 |
for n, l in enumerate(output): |
857
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
548 |
lout, lcmd = l, None |
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
549 |
if salt in l: |
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
550 |
lout, lcmd = l.split(salt, 1) |
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
551 |
|
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
552 |
if lout: |
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
553 |
if lcmd: |
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
554 |
lout += ' (no-eol)\n' |
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
555 |
|
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
556 |
el = None |
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
557 |
if pos in expected and expected[pos]: |
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
558 |
el = expected[pos].pop(0) |
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
559 |
|
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
560 |
if el == lout: # perfect match (fast) |
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
561 |
postout.append(" " + lout) |
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
562 |
elif (el and |
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
563 |
(el.endswith(" (re)\n") and rematch(el[:-6] + '\n', lout) or |
860
1ea19e827b5b
run-test: fixed wrong parenthesis
Erik Zielke <ez@aragost.com>
parents:
858
diff
changeset
|
564 |
el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', lout) |
1ea19e827b5b
run-test: fixed wrong parenthesis
Erik Zielke <ez@aragost.com>
parents:
858
diff
changeset
|
565 |
or el.endswith(" (esc)\n") and |
1ea19e827b5b
run-test: fixed wrong parenthesis
Erik Zielke <ez@aragost.com>
parents:
858
diff
changeset
|
566 |
el.decode('string-escape') == l)): |
858
ff1badf6ae7a
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
857
diff
changeset
|
567 |
postout.append(" " + el) # fallback regex/glob/esc match |
857
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
568 |
else: |
858
ff1badf6ae7a
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
857
diff
changeset
|
569 |
if needescape(lout): |
ff1badf6ae7a
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
857
diff
changeset
|
570 |
lout = stringescape(lout.rstrip('\n')) + " (esc)\n" |
857
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
571 |
postout.append(" " + lout) # let diff deal with it |
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
572 |
|
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
573 |
if lcmd: |
793
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
777
diff
changeset
|
574 |
# add on last return code |
857
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
575 |
ret = int(lcmd.split()[1]) |
793
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
777
diff
changeset
|
576 |
if ret != 0: |
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
777
diff
changeset
|
577 |
postout.append(" [%s]\n" % ret) |
776
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
578 |
if pos in after: |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
579 |
postout += after.pop(pos) |
857
7060aa668b7f
tests: (no-eol) markup for command output without trailing LF
Mads Kiilerich <mads@kiilerich.com>
parents:
856
diff
changeset
|
580 |
pos = int(lcmd.split()[0]) |
776
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
581 |
|
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
582 |
if pos in after: |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
583 |
postout += after.pop(pos) |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
584 |
|
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
585 |
return exitcode, postout |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
586 |
|
878
e1a93489159d
run-tests: only call WIFEXITED on systems it exists
Simon Heimberg <simohe@besonet.ch>
parents:
877
diff
changeset
|
587 |
wifexited = getattr(os, "WIFEXITED", lambda x: False) |
826
ac9b63e01e2a
tests: replace test tmp directory with $TESTTMP in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
824
diff
changeset
|
588 |
def run(cmd, options, replacements): |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
589 |
"""Run command in a sub-process, capturing the output (stdout and stderr). |
670 | 590 |
Return a tuple (exitcode, output). output is None in debug mode.""" |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
591 |
# TODO: Use subprocess.Popen if we're running on Python 2.4 |
670 | 592 |
if options.debug: |
593 |
proc = subprocess.Popen(cmd, shell=True) |
|
594 |
ret = proc.wait() |
|
595 |
return (ret, None) |
|
596 |
||
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
597 |
if os.name == 'nt' or sys.platform.startswith('java'): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
598 |
tochild, fromchild = os.popen4(cmd) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
599 |
tochild.close() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
600 |
output = fromchild.read() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
601 |
ret = fromchild.close() |
866
d51c3fd4e34a
code style: prefer 'is' and 'is not' tests with singletons
Martin Geisler <mg@aragost.com>
parents:
862
diff
changeset
|
602 |
if ret is None: |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
603 |
ret = 0 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
604 |
else: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
605 |
proc = Popen4(cmd) |
682
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
606 |
def cleanup(): |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
607 |
os.kill(proc.pid, signal.SIGTERM) |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
608 |
ret = proc.wait() |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
609 |
if ret == 0: |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
610 |
ret = signal.SIGTERM << 8 |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
611 |
killdaemons() |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
612 |
return ret |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
613 |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
614 |
try: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
615 |
output = '' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
616 |
proc.tochild.close() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
617 |
output = proc.fromchild.read() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
618 |
ret = proc.wait() |
878
e1a93489159d
run-tests: only call WIFEXITED on systems it exists
Simon Heimberg <simohe@besonet.ch>
parents:
877
diff
changeset
|
619 |
if wifexited(ret): |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
620 |
ret = os.WEXITSTATUS(ret) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
621 |
except Timeout: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
622 |
vlog('# Process %d timed out - killing it' % proc.pid) |
682
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
623 |
ret = cleanup() |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
624 |
output += ("\n### Abort: timeout after %d seconds.\n" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
625 |
% options.timeout) |
682
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
626 |
except KeyboardInterrupt: |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
627 |
vlog('# Handling keyboard interrupt') |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
628 |
cleanup() |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
629 |
raise |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
630 |
|
826
ac9b63e01e2a
tests: replace test tmp directory with $TESTTMP in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
824
diff
changeset
|
631 |
for s, r in replacements: |
852
fb1e8925292d
run-tests: use regex when searching for $HGPORT in test output
Martin Geisler <mg@aragost.com>
parents:
844
diff
changeset
|
632 |
output = re.sub(s, r, output) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
633 |
return ret, splitnewlines(output) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
634 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
635 |
def runone(options, test, skips, fails): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
636 |
'''tristate output: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
637 |
None -> skipped |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
638 |
True -> passed |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
639 |
False -> failed''' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
640 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
641 |
def skip(msg): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
642 |
if not options.verbose: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
643 |
skips.append((test, msg)) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
644 |
else: |
670 | 645 |
print "\nSkipping %s: %s" % (testpath, msg) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
646 |
return None |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
647 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
648 |
def fail(msg): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
649 |
fails.append((test, msg)) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
650 |
if not options.nodiff: |
670 | 651 |
print "\nERROR: %s %s" % (testpath, msg) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
652 |
return None |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
653 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
654 |
vlog("# Test", test) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
655 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
656 |
# create a fresh hgrc |
670 | 657 |
hgrc = open(HGRCPATH, 'w+') |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
658 |
hgrc.write('[ui]\n') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
659 |
hgrc.write('slash = True\n') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
660 |
hgrc.write('[defaults]\n') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
661 |
hgrc.write('backout = -d "0 0"\n') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
662 |
hgrc.write('commit = -d "0 0"\n') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
663 |
hgrc.write('tag = -d "0 0"\n') |
670 | 664 |
if options.inotify: |
665 |
hgrc.write('[extensions]\n') |
|
666 |
hgrc.write('inotify=\n') |
|
667 |
hgrc.write('[inotify]\n') |
|
668 |
hgrc.write('pidfile=%s\n' % DAEMON_PIDS) |
|
669 |
hgrc.write('appendpid=True\n') |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
670 |
hgrc.close() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
671 |
|
693
8428f3bda904
run-tests.py: skipped tests shouldn't change working directory
Mads Kiilerich <mads@kiilerich.com>
parents:
692
diff
changeset
|
672 |
testpath = os.path.join(TESTDIR, test) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
673 |
ref = os.path.join(TESTDIR, test+".out") |
693
8428f3bda904
run-tests.py: skipped tests shouldn't change working directory
Mads Kiilerich <mads@kiilerich.com>
parents:
692
diff
changeset
|
674 |
err = os.path.join(TESTDIR, test+".err") |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
675 |
if os.path.exists(err): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
676 |
os.remove(err) # Remove any previous output files |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
677 |
try: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
678 |
tf = open(testpath) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
679 |
firstline = tf.readline().rstrip() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
680 |
tf.close() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
681 |
except: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
682 |
firstline = '' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
683 |
lctest = test.lower() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
684 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
685 |
if lctest.endswith('.py') or firstline == '#!/usr/bin/env python': |
775
16f4cb2900fe
tests: move script execution in runner helpers
Matt Mackall <mpm@selenic.com>
parents:
741
diff
changeset
|
686 |
runner = pytest |
776
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
687 |
elif lctest.endswith('.t'): |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
688 |
runner = tsttest |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
689 |
ref = testpath |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
690 |
else: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
691 |
# do not try to run non-executable programs |
834
5a6898736b1a
run-tests.py: remove support for .bat files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
833
diff
changeset
|
692 |
if not os.access(testpath, os.X_OK): |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
693 |
return skip("not executable") |
775
16f4cb2900fe
tests: move script execution in runner helpers
Matt Mackall <mpm@selenic.com>
parents:
741
diff
changeset
|
694 |
runner = shtest |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
695 |
|
693
8428f3bda904
run-tests.py: skipped tests shouldn't change working directory
Mads Kiilerich <mads@kiilerich.com>
parents:
692
diff
changeset
|
696 |
# Make a tmp subdirectory to work in |
826
ac9b63e01e2a
tests: replace test tmp directory with $TESTTMP in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
824
diff
changeset
|
697 |
testtmp = os.environ["TESTTMP"] = os.path.join(HGTMP, test) |
ac9b63e01e2a
tests: replace test tmp directory with $TESTTMP in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
824
diff
changeset
|
698 |
os.mkdir(testtmp) |
ac9b63e01e2a
tests: replace test tmp directory with $TESTTMP in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
824
diff
changeset
|
699 |
os.chdir(testtmp) |
693
8428f3bda904
run-tests.py: skipped tests shouldn't change working directory
Mads Kiilerich <mads@kiilerich.com>
parents:
692
diff
changeset
|
700 |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
701 |
if options.timeout > 0: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
702 |
signal.alarm(options.timeout) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
703 |
|
829
7d66d78e6179
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
826
diff
changeset
|
704 |
ret, out = runner(testpath, options, [ |
852
fb1e8925292d
run-tests: use regex when searching for $HGPORT in test output
Martin Geisler <mg@aragost.com>
parents:
844
diff
changeset
|
705 |
(re.escape(testtmp), '$TESTTMP'), |
fb1e8925292d
run-tests: use regex when searching for $HGPORT in test output
Martin Geisler <mg@aragost.com>
parents:
844
diff
changeset
|
706 |
(r':%s\b' % options.port, ':$HGPORT'), |
fb1e8925292d
run-tests: use regex when searching for $HGPORT in test output
Martin Geisler <mg@aragost.com>
parents:
844
diff
changeset
|
707 |
(r':%s\b' % (options.port + 1), ':$HGPORT1'), |
fb1e8925292d
run-tests: use regex when searching for $HGPORT in test output
Martin Geisler <mg@aragost.com>
parents:
844
diff
changeset
|
708 |
(r':%s\b' % (options.port + 2), ':$HGPORT2'), |
829
7d66d78e6179
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
826
diff
changeset
|
709 |
]) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
710 |
vlog("# Ret was:", ret) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
711 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
712 |
if options.timeout > 0: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
713 |
signal.alarm(0) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
714 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
715 |
mark = '.' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
716 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
717 |
skipped = (ret == SKIPPED_STATUS) |
741
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
718 |
|
670 | 719 |
# If we're not in --debug mode and reference output file exists, |
720 |
# check test output against it. |
|
721 |
if options.debug: |
|
866
d51c3fd4e34a
code style: prefer 'is' and 'is not' tests with singletons
Martin Geisler <mg@aragost.com>
parents:
862
diff
changeset
|
722 |
refout = None # to match "out is None" |
670 | 723 |
elif os.path.exists(ref): |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
724 |
f = open(ref, "r") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
725 |
refout = splitnewlines(f.read()) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
726 |
f.close() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
727 |
else: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
728 |
refout = [] |
670 | 729 |
|
741
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
730 |
if (ret != 0 or out != refout) and not skipped and not options.debug: |
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
731 |
# Save errors to a file for diagnosis |
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
732 |
f = open(err, "wb") |
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
733 |
for line in out: |
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
734 |
f.write(line) |
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
735 |
f.close() |
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
736 |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
737 |
if skipped: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
738 |
mark = 's' |
670 | 739 |
if out is None: # debug mode: nothing to parse |
740 |
missing = ['unknown'] |
|
741 |
failed = None |
|
742 |
else: |
|
743 |
missing, failed = parsehghaveoutput(out) |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
744 |
if not missing: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
745 |
missing = ['irrelevant'] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
746 |
if failed: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
747 |
fail("hghave failed checking for %s" % failed[-1]) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
748 |
skipped = False |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
749 |
else: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
750 |
skip(missing[-1]) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
751 |
elif out != refout: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
752 |
mark = '!' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
753 |
if ret: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
754 |
fail("output changed and returned error code %d" % ret) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
755 |
else: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
756 |
fail("output changed") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
757 |
if not options.nodiff: |
741
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
758 |
if options.view: |
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
759 |
os.system("%s %s %s" % (options.view, ref, err)) |
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
760 |
else: |
e5bfe51eeea9
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com>
parents:
740
diff
changeset
|
761 |
showdiff(refout, out, ref, err) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
762 |
ret = 1 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
763 |
elif ret: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
764 |
mark = '!' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
765 |
fail("returned error code %d" % ret) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
766 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
767 |
if not options.verbose: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
768 |
sys.stdout.write(mark) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
769 |
sys.stdout.flush() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
770 |
|
682
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
771 |
killdaemons() |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
772 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
773 |
os.chdir(TESTDIR) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
774 |
if not options.keep_tmpdir: |
826
ac9b63e01e2a
tests: replace test tmp directory with $TESTTMP in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
824
diff
changeset
|
775 |
shutil.rmtree(testtmp, True) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
776 |
if skipped: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
777 |
return None |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
778 |
return ret == 0 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
779 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
780 |
_hgpath = None |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
781 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
782 |
def _gethgpath(): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
783 |
"""Return the path to the mercurial package that is actually found by |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
784 |
the current Python interpreter.""" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
785 |
global _hgpath |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
786 |
if _hgpath is not None: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
787 |
return _hgpath |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
788 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
789 |
cmd = '%s -c "import mercurial; print mercurial.__path__[0]"' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
790 |
pipe = os.popen(cmd % PYTHON) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
791 |
try: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
792 |
_hgpath = pipe.read().strip() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
793 |
finally: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
794 |
pipe.close() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
795 |
return _hgpath |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
796 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
797 |
def _checkhglib(verb): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
798 |
"""Ensure that the 'mercurial' package imported by python is |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
799 |
the one we expect it to be. If not, print a warning to stderr.""" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
800 |
expecthg = os.path.join(PYTHONDIR, 'mercurial') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
801 |
actualhg = _gethgpath() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
802 |
if actualhg != expecthg: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
803 |
sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
804 |
' (expected %s)\n' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
805 |
% (verb, actualhg, expecthg)) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
806 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
807 |
def runchildren(options, tests): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
808 |
if INST: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
809 |
installhg(options) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
810 |
_checkhglib("Testing") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
811 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
812 |
optcopy = dict(options.__dict__) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
813 |
optcopy['jobs'] = 1 |
725
212432db2043
Fix --blacklist when --jobs > 1 in run_tests.py.
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
724
diff
changeset
|
814 |
del optcopy['blacklist'] |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
815 |
if optcopy['with_hg'] is None: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
816 |
optcopy['with_hg'] = os.path.join(BINDIR, "hg") |
718
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
817 |
optcopy.pop('anycoverage', None) |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
818 |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
819 |
opts = [] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
820 |
for opt, value in optcopy.iteritems(): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
821 |
name = '--' + opt.replace('_', '-') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
822 |
if value is True: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
823 |
opts.append(name) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
824 |
elif value is not None: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
825 |
opts.append(name + '=' + str(value)) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
826 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
827 |
tests.reverse() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
828 |
jobs = [[] for j in xrange(options.jobs)] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
829 |
while tests: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
830 |
for job in jobs: |
680
f10a5301d082
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
674
diff
changeset
|
831 |
if not tests: |
f10a5301d082
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
674
diff
changeset
|
832 |
break |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
833 |
job.append(tests.pop()) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
834 |
fps = {} |
682
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
835 |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
836 |
for j, job in enumerate(jobs): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
837 |
if not job: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
838 |
continue |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
839 |
rfd, wfd = os.pipe() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
840 |
childopts = ['--child=%d' % wfd, '--port=%d' % (options.port + j * 3)] |
670 | 841 |
childtmp = os.path.join(HGTMP, 'child%d' % j) |
842 |
childopts += ['--tmpdir', childtmp] |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
843 |
cmdline = [PYTHON, sys.argv[0]] + opts + childopts + job |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
844 |
vlog(' '.join(cmdline)) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
845 |
fps[os.spawnvp(os.P_NOWAIT, cmdline[0], cmdline)] = os.fdopen(rfd, 'r') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
846 |
os.close(wfd) |
682
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
847 |
signal.signal(signal.SIGINT, signal.SIG_IGN) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
848 |
failures = 0 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
849 |
tested, skipped, failed = 0, 0, 0 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
850 |
skips = [] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
851 |
fails = [] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
852 |
while fps: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
853 |
pid, status = os.wait() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
854 |
fp = fps.pop(pid) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
855 |
l = fp.read().splitlines() |
682
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
856 |
try: |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
857 |
test, skip, fail = map(int, l[:3]) |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
858 |
except ValueError: |
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
859 |
test, skip, fail = 0, 0, 0 |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
860 |
split = -fail or len(l) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
861 |
for s in l[3:split]: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
862 |
skips.append(s.split(" ", 1)) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
863 |
for s in l[split:]: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
864 |
fails.append(s.split(" ", 1)) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
865 |
tested += test |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
866 |
skipped += skip |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
867 |
failed += fail |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
868 |
vlog('pid %d exited, status %d' % (pid, status)) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
869 |
failures |= status |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
870 |
print |
670 | 871 |
if not options.noskips: |
872 |
for s in skips: |
|
873 |
print "Skipped %s: %s" % (s[0], s[1]) |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
874 |
for s in fails: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
875 |
print "Failed %s: %s" % (s[0], s[1]) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
876 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
877 |
_checkhglib("Tested") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
878 |
print "# Ran %d tests, %d skipped, %d failed." % ( |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
879 |
tested, skipped, failed) |
718
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
880 |
|
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
881 |
if options.anycoverage: |
88d7be7899ac
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
693
diff
changeset
|
882 |
outputcoverage(options) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
883 |
sys.exit(failures != 0) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
884 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
885 |
def runtests(options, tests): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
886 |
global DAEMON_PIDS, HGRCPATH |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
887 |
DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
888 |
HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
889 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
890 |
try: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
891 |
if INST: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
892 |
installhg(options) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
893 |
_checkhglib("Testing") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
894 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
895 |
if options.timeout > 0: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
896 |
try: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
897 |
signal.signal(signal.SIGALRM, alarmed) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
898 |
vlog('# Running each test with %d second timeout' % |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
899 |
options.timeout) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
900 |
except AttributeError: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
901 |
print 'WARNING: cannot run tests with timeouts' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
902 |
options.timeout = 0 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
903 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
904 |
tested = 0 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
905 |
failed = 0 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
906 |
skipped = 0 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
907 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
908 |
if options.restart: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
909 |
orig = list(tests) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
910 |
while tests: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
911 |
if os.path.exists(tests[0] + ".err"): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
912 |
break |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
913 |
tests.pop(0) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
914 |
if not tests: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
915 |
print "running all tests" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
916 |
tests = orig |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
917 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
918 |
skips = [] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
919 |
fails = [] |
670 | 920 |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
921 |
for test in tests: |
670 | 922 |
if options.blacklist: |
681
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
923 |
filename = options.blacklist.get(test) |
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
924 |
if filename is not None: |
d0a410e49776
run-tests: split tests/blacklist in tests/blacklists/*
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
680
diff
changeset
|
925 |
skips.append((test, "blacklisted (%s)" % filename)) |
670 | 926 |
skipped += 1 |
927 |
continue |
|
928 |
||
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
929 |
if options.retest and not os.path.exists(test + ".err"): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
930 |
skipped += 1 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
931 |
continue |
670 | 932 |
|
933 |
if options.keywords: |
|
880
0b9f0c42b566
explicitly close files
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
878
diff
changeset
|
934 |
fp = open(test) |
0b9f0c42b566
explicitly close files
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
878
diff
changeset
|
935 |
t = fp.read().lower() + test.lower() |
0b9f0c42b566
explicitly close files
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
878
diff
changeset
|
936 |
fp.close() |
670 | 937 |
for k in options.keywords.lower().split(): |
938 |
if k in t: |
|
939 |
break |
|
940 |
else: |
|
683
26ca426a04e1
fix up a bunch of check-code warnings
Matt Mackall <mpm@selenic.com>
parents:
682
diff
changeset
|
941 |
skipped += 1 |
670 | 942 |
continue |
943 |
||
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
944 |
ret = runone(options, test, skips, fails) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
945 |
if ret is None: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
946 |
skipped += 1 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
947 |
elif not ret: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
948 |
if options.interactive: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
949 |
print "Accept this change? [n] ", |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
950 |
answer = sys.stdin.readline().strip() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
951 |
if answer.lower() in "y yes".split(): |
776
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
952 |
if test.endswith(".t"): |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
953 |
rename(test + ".err", test) |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
954 |
else: |
1869efbf104d
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com>
parents:
775
diff
changeset
|
955 |
rename(test + ".err", test + ".out") |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
956 |
tested += 1 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
957 |
fails.pop() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
958 |
continue |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
959 |
failed += 1 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
960 |
if options.first: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
961 |
break |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
962 |
tested += 1 |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
963 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
964 |
if options.child: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
965 |
fp = os.fdopen(options.child, 'w') |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
966 |
fp.write('%d\n%d\n%d\n' % (tested, skipped, failed)) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
967 |
for s in skips: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
968 |
fp.write("%s %s\n" % s) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
969 |
for s in fails: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
970 |
fp.write("%s %s\n" % s) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
971 |
fp.close() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
972 |
else: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
973 |
print |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
974 |
for s in skips: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
975 |
print "Skipped %s: %s" % s |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
976 |
for s in fails: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
977 |
print "Failed %s: %s" % s |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
978 |
_checkhglib("Tested") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
979 |
print "# Ran %d tests, %d skipped, %d failed." % ( |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
980 |
tested, skipped, failed) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
981 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
982 |
if options.anycoverage: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
983 |
outputcoverage(options) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
984 |
except KeyboardInterrupt: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
985 |
failed = True |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
986 |
print "\ninterrupted!" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
987 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
988 |
if failed: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
989 |
sys.exit(1) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
990 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
991 |
def main(): |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
992 |
(options, args) = parseargs() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
993 |
if not options.child: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
994 |
os.umask(022) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
995 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
996 |
checktools() |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
997 |
|
833
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
998 |
if len(args) == 0: |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
999 |
args = os.listdir(".") |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1000 |
args.sort() |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1001 |
|
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1002 |
tests = [] |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1003 |
skipped = [] |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1004 |
for test in args: |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1005 |
if (test.startswith("test-") and '~' not in test and |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1006 |
('.' not in test or test.endswith('.py') or |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1007 |
test.endswith('.bat') or test.endswith('.t'))): |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1008 |
if not os.path.exists(test): |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1009 |
skipped.append(test) |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1010 |
else: |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1011 |
tests.append(test) |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1012 |
if not tests: |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1013 |
for test in skipped: |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1014 |
print 'Skipped %s: does not exist' % test |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1015 |
print "# Ran 0 tests, %d skipped, 0 failed." % len(skipped) |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1016 |
return |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1017 |
tests = tests + skipped |
a9c6ada32647
run-tests.py: do not install hg when the tests do no exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
829
diff
changeset
|
1018 |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1019 |
# Reset some environment variables to well-known values so that |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1020 |
# the tests produce repeatable output. |
670 | 1021 |
os.environ['LANG'] = os.environ['LC_ALL'] = os.environ['LANGUAGE'] = 'C' |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1022 |
os.environ['TZ'] = 'GMT' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1023 |
os.environ["EMAIL"] = "Foo Bar <foo.bar@example.com>" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1024 |
os.environ['CDPATH'] = '' |
670 | 1025 |
os.environ['COLUMNS'] = '80' |
719
ad3048630bd8
run-tests: make sure GREP_OPTIONS isn't set
Brodie Rao <brodie@bitheap.org>
parents:
718
diff
changeset
|
1026 |
os.environ['GREP_OPTIONS'] = '' |
692
5ac40b193130
run-tests.py: clears http_proxy for all tests
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
683
diff
changeset
|
1027 |
os.environ['http_proxy'] = '' |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1028 |
|
724
211fa4b9803d
run-tests.py: reset env variables set by hooks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
722
diff
changeset
|
1029 |
# unset env related to hooks |
211fa4b9803d
run-tests.py: reset env variables set by hooks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
722
diff
changeset
|
1030 |
for k in os.environ.keys(): |
211fa4b9803d
run-tests.py: reset env variables set by hooks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
722
diff
changeset
|
1031 |
if k.startswith('HG_'): |
728
5df6643c39e9
run-tests.py: can't remove from os.environ on solaris
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
726
diff
changeset
|
1032 |
# can't remove on solaris |
5df6643c39e9
run-tests.py: can't remove from os.environ on solaris
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
726
diff
changeset
|
1033 |
os.environ[k] = '' |
724
211fa4b9803d
run-tests.py: reset env variables set by hooks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
722
diff
changeset
|
1034 |
del os.environ[k] |
211fa4b9803d
run-tests.py: reset env variables set by hooks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
722
diff
changeset
|
1035 |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1036 |
global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1037 |
TESTDIR = os.environ["TESTDIR"] = os.getcwd() |
670 | 1038 |
if options.tmpdir: |
1039 |
options.keep_tmpdir = True |
|
1040 |
tmpdir = options.tmpdir |
|
1041 |
if os.path.exists(tmpdir): |
|
1042 |
# Meaning of tmpdir has changed since 1.3: we used to create |
|
1043 |
# HGTMP inside tmpdir; now HGTMP is tmpdir. So fail if |
|
1044 |
# tmpdir already exists. |
|
1045 |
sys.exit("error: temp dir %r already exists" % tmpdir) |
|
1046 |
||
1047 |
# Automatically removing tmpdir sounds convenient, but could |
|
1048 |
# really annoy anyone in the habit of using "--tmpdir=/tmp" |
|
1049 |
# or "--tmpdir=$HOME". |
|
1050 |
#vlog("# Removing temp dir", tmpdir) |
|
1051 |
#shutil.rmtree(tmpdir) |
|
1052 |
os.makedirs(tmpdir) |
|
1053 |
else: |
|
1054 |
tmpdir = tempfile.mkdtemp('', 'hgtests.') |
|
1055 |
HGTMP = os.environ['HGTMP'] = os.path.realpath(tmpdir) |
|
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1056 |
DAEMON_PIDS = None |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1057 |
HGRCPATH = None |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1058 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1059 |
os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1060 |
os.environ["HGMERGE"] = "internal:merge" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1061 |
os.environ["HGUSER"] = "test" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1062 |
os.environ["HGENCODING"] = "ascii" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1063 |
os.environ["HGENCODINGMODE"] = "strict" |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1064 |
os.environ["HGPORT"] = str(options.port) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1065 |
os.environ["HGPORT1"] = str(options.port + 1) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1066 |
os.environ["HGPORT2"] = str(options.port + 2) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1067 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1068 |
if options.with_hg: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1069 |
INST = None |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1070 |
BINDIR = os.path.dirname(os.path.realpath(options.with_hg)) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1071 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1072 |
# This looks redundant with how Python initializes sys.path from |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1073 |
# the location of the script being executed. Needed because the |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1074 |
# "hg" specified by --with-hg is not the only Python script |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1075 |
# executed in the test suite that needs to import 'mercurial' |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1076 |
# ... which means it's not really redundant at all. |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1077 |
PYTHONDIR = BINDIR |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1078 |
else: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1079 |
INST = os.path.join(HGTMP, "install") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1080 |
BINDIR = os.environ["BINDIR"] = os.path.join(INST, "bin") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1081 |
PYTHONDIR = os.path.join(INST, "lib", "python") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1082 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1083 |
os.environ["BINDIR"] = BINDIR |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1084 |
os.environ["PYTHON"] = PYTHON |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1085 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1086 |
if not options.child: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1087 |
path = [BINDIR] + os.environ["PATH"].split(os.pathsep) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1088 |
os.environ["PATH"] = os.pathsep.join(path) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1089 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1090 |
# Include TESTDIR in PYTHONPATH so that out-of-tree extensions |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1091 |
# can run .../tests/run-tests.py test-foo where test-foo |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1092 |
# adds an extension to HGRC |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1093 |
pypath = [PYTHONDIR, TESTDIR] |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1094 |
# We have to augment PYTHONPATH, rather than simply replacing |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1095 |
# it, in case external libraries are only available via current |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1096 |
# PYTHONPATH. (In particular, the Subversion bindings on OS X |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1097 |
# are in /opt/subversion.) |
720
8008f7627b2f
tests: adapt the test runner to work with jython
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
719
diff
changeset
|
1098 |
oldpypath = os.environ.get(IMPL_PATH) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1099 |
if oldpypath: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1100 |
pypath.append(oldpypath) |
720
8008f7627b2f
tests: adapt the test runner to work with jython
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
719
diff
changeset
|
1101 |
os.environ[IMPL_PATH] = os.pathsep.join(pypath) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1102 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1103 |
COVERAGE_FILE = os.path.join(TESTDIR, ".coverage") |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1104 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1105 |
vlog("# Using TESTDIR", TESTDIR) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1106 |
vlog("# Using HGTMP", HGTMP) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1107 |
vlog("# Using PATH", os.environ["PATH"]) |
720
8008f7627b2f
tests: adapt the test runner to work with jython
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
719
diff
changeset
|
1108 |
vlog("# Using", IMPL_PATH, os.environ[IMPL_PATH]) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1109 |
|
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1110 |
try: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1111 |
if len(tests) > 1 and options.jobs > 1: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1112 |
runchildren(options, tests) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1113 |
else: |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1114 |
runtests(options, tests) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1115 |
finally: |
682
1c7056415039
run-tests: kill daemons on ^C with -j.
Brendan Cully <brendan@kublai.com>
parents:
681
diff
changeset
|
1116 |
time.sleep(1) |
562
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1117 |
cleanup(options) |
b1aa7b64890b
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1118 |
|
877
c2ca6e172fd8
run-tests: loadable as module
Simon Heimberg <simohe@besonet.ch>
parents:
866
diff
changeset
|
1119 |
if __name__ == '__main__': |
c2ca6e172fd8
run-tests: loadable as module
Simon Heimberg <simohe@besonet.ch>
parents:
866
diff
changeset
|
1120 |
main() |