2016-03-22 22:04:32 -03:00
|
|
|
import faulthandler
|
2015-09-29 18:15:38 -03:00
|
|
|
import json
|
|
|
|
import os
|
2015-09-29 22:05:43 -03:00
|
|
|
import queue
|
2015-09-29 18:15:38 -03:00
|
|
|
import sys
|
2017-09-07 13:56:24 -03:00
|
|
|
import threading
|
2015-09-29 19:33:29 -03:00
|
|
|
import time
|
2015-09-29 18:15:38 -03:00
|
|
|
import traceback
|
2015-09-29 20:32:39 -03:00
|
|
|
import types
|
2015-09-29 18:15:38 -03:00
|
|
|
from test import support
|
|
|
|
|
2016-03-23 08:14:10 -03:00
|
|
|
from test.libregrtest.runtest import (
|
2016-05-20 08:37:40 -03:00
|
|
|
runtest, INTERRUPTED, CHILD_ERROR, PROGRESS_MIN_TIME,
|
|
|
|
format_test_result)
|
2015-09-29 21:17:28 -03:00
|
|
|
from test.libregrtest.setup import setup_tests
|
2018-06-01 06:04:45 -03:00
|
|
|
from test.libregrtest.utils import format_duration
|
2015-09-29 18:15:38 -03:00
|
|
|
|
|
|
|
|
2015-09-29 22:05:43 -03:00
|
|
|
# Display the running tests if nothing happened last N seconds
|
2015-11-04 04:03:53 -04:00
|
|
|
PROGRESS_UPDATE = 30.0 # seconds
|
2015-09-29 22:05:43 -03:00
|
|
|
|
2016-03-29 04:50:18 -03:00
|
|
|
# If interrupted, display the wait progress every N seconds
|
2016-03-24 08:04:15 -03:00
|
|
|
WAIT_PROGRESS = 2.0 # seconds
|
|
|
|
|
2015-09-29 19:33:29 -03:00
|
|
|
|
|
|
|
def run_test_in_subprocess(testname, ns):
|
2018-09-07 12:20:42 -03:00
|
|
|
"""Run the given test in a subprocess with --worker-args.
|
2015-09-29 18:15:38 -03:00
|
|
|
|
|
|
|
ns is the option Namespace parsed from command-line arguments. regrtest
|
2018-09-07 12:20:42 -03:00
|
|
|
is invoked in a subprocess with the --worker-args argument; when the
|
2015-09-29 18:15:38 -03:00
|
|
|
subprocess exits, its return code, stdout and stderr are returned as a
|
|
|
|
3-tuple.
|
|
|
|
"""
|
|
|
|
from subprocess import Popen, PIPE
|
2015-09-29 19:33:29 -03:00
|
|
|
|
2015-09-29 20:32:39 -03:00
|
|
|
ns_dict = vars(ns)
|
2018-09-07 12:20:42 -03:00
|
|
|
worker_args = (ns_dict, testname)
|
|
|
|
worker_args = json.dumps(worker_args)
|
2015-09-29 19:33:29 -03:00
|
|
|
|
|
|
|
cmd = [sys.executable, *support.args_from_interpreter_flags(),
|
2016-09-21 12:12:50 -03:00
|
|
|
'-u', # Unbuffered stdout and stderr
|
2015-09-29 19:33:29 -03:00
|
|
|
'-m', 'test.regrtest',
|
2018-09-07 12:20:42 -03:00
|
|
|
'--worker-args', worker_args]
|
2015-10-02 20:20:49 -03:00
|
|
|
if ns.pgo:
|
|
|
|
cmd += ['--pgo']
|
2015-09-29 19:33:29 -03:00
|
|
|
|
2015-09-29 18:15:38 -03:00
|
|
|
# Running the child from the same working directory as regrtest's original
|
|
|
|
# invocation ensures that TEMPDIR for the child is the same when
|
|
|
|
# sysconfig.is_python_build() is true. See issue 15300.
|
2015-09-29 19:33:29 -03:00
|
|
|
popen = Popen(cmd,
|
2015-09-29 18:15:38 -03:00
|
|
|
stdout=PIPE, stderr=PIPE,
|
|
|
|
universal_newlines=True,
|
|
|
|
close_fds=(os.name != 'nt'),
|
|
|
|
cwd=support.SAVEDCWD)
|
2015-09-29 19:33:29 -03:00
|
|
|
with popen:
|
|
|
|
stdout, stderr = popen.communicate()
|
|
|
|
retcode = popen.wait()
|
2015-09-29 18:15:38 -03:00
|
|
|
return retcode, stdout, stderr
|
|
|
|
|
|
|
|
|
2018-09-07 12:20:42 -03:00
|
|
|
def run_tests_worker(worker_args):
|
|
|
|
ns_dict, testname = json.loads(worker_args)
|
2015-09-29 20:32:39 -03:00
|
|
|
ns = types.SimpleNamespace(**ns_dict)
|
|
|
|
|
2015-09-29 21:17:28 -03:00
|
|
|
setup_tests(ns)
|
2015-09-29 20:32:39 -03:00
|
|
|
|
2015-09-29 18:15:38 -03:00
|
|
|
try:
|
2015-09-29 21:32:11 -03:00
|
|
|
result = runtest(ns, testname)
|
2015-09-29 18:15:38 -03:00
|
|
|
except KeyboardInterrupt:
|
2018-09-18 13:10:26 -03:00
|
|
|
result = INTERRUPTED, '', None
|
2015-09-29 18:15:38 -03:00
|
|
|
except BaseException as e:
|
|
|
|
traceback.print_exc()
|
|
|
|
result = CHILD_ERROR, str(e)
|
2015-09-29 21:39:22 -03:00
|
|
|
|
2015-09-29 18:15:38 -03:00
|
|
|
print() # Force a newline (just in case)
|
2015-09-29 19:48:27 -03:00
|
|
|
print(json.dumps(result), flush=True)
|
2015-09-29 18:15:38 -03:00
|
|
|
sys.exit(0)
|
|
|
|
|
|
|
|
|
|
|
|
# We do not use a generator so multiple threads can call next().
|
|
|
|
class MultiprocessIterator:
|
|
|
|
|
|
|
|
"""A thread-safe iterator over tests for multiprocess mode."""
|
|
|
|
|
|
|
|
def __init__(self, tests):
|
|
|
|
self.interrupted = False
|
|
|
|
self.lock = threading.Lock()
|
|
|
|
self.tests = tests
|
|
|
|
|
|
|
|
def __iter__(self):
|
|
|
|
return self
|
|
|
|
|
|
|
|
def __next__(self):
|
|
|
|
with self.lock:
|
|
|
|
if self.interrupted:
|
|
|
|
raise StopIteration('tests interrupted')
|
|
|
|
return next(self.tests)
|
|
|
|
|
|
|
|
|
|
|
|
class MultiprocessThread(threading.Thread):
|
|
|
|
def __init__(self, pending, output, ns):
|
|
|
|
super().__init__()
|
|
|
|
self.pending = pending
|
|
|
|
self.output = output
|
|
|
|
self.ns = ns
|
2015-09-29 19:33:29 -03:00
|
|
|
self.current_test = None
|
|
|
|
self.start_time = None
|
|
|
|
|
|
|
|
def _runtest(self):
|
|
|
|
try:
|
|
|
|
test = next(self.pending)
|
|
|
|
except StopIteration:
|
|
|
|
self.output.put((None, None, None, None))
|
|
|
|
return True
|
|
|
|
|
|
|
|
try:
|
|
|
|
self.start_time = time.monotonic()
|
|
|
|
self.current_test = test
|
|
|
|
|
|
|
|
retcode, stdout, stderr = run_test_in_subprocess(test, self.ns)
|
|
|
|
finally:
|
|
|
|
self.current_test = None
|
|
|
|
|
|
|
|
if retcode != 0:
|
2018-09-18 13:10:26 -03:00
|
|
|
result = (CHILD_ERROR, "Exit code %s" % retcode, None)
|
2015-09-29 19:33:29 -03:00
|
|
|
self.output.put((test, stdout.rstrip(), stderr.rstrip(),
|
|
|
|
result))
|
2017-02-06 07:42:00 -04:00
|
|
|
return False
|
2015-09-29 19:33:29 -03:00
|
|
|
|
2017-05-09 06:34:01 -03:00
|
|
|
stdout, _, result = stdout.strip().rpartition("\n")
|
2015-09-29 19:33:29 -03:00
|
|
|
if not result:
|
|
|
|
self.output.put((None, None, None, None))
|
|
|
|
return True
|
|
|
|
|
|
|
|
result = json.loads(result)
|
2018-09-18 13:10:26 -03:00
|
|
|
assert len(result) == 3, f"Invalid result tuple: {result!r}"
|
2015-09-29 19:33:29 -03:00
|
|
|
self.output.put((test, stdout.rstrip(), stderr.rstrip(),
|
|
|
|
result))
|
|
|
|
return False
|
2015-09-29 18:15:38 -03:00
|
|
|
|
|
|
|
def run(self):
|
|
|
|
try:
|
2015-09-29 19:33:29 -03:00
|
|
|
stop = False
|
|
|
|
while not stop:
|
|
|
|
stop = self._runtest()
|
2015-09-29 18:15:38 -03:00
|
|
|
except BaseException:
|
|
|
|
self.output.put((None, None, None, None))
|
|
|
|
raise
|
|
|
|
|
|
|
|
|
|
|
|
def run_tests_multiprocess(regrtest):
|
2015-09-29 22:05:43 -03:00
|
|
|
output = queue.Queue()
|
2015-09-29 18:15:38 -03:00
|
|
|
pending = MultiprocessIterator(regrtest.tests)
|
2016-03-22 22:04:32 -03:00
|
|
|
test_timeout = regrtest.ns.timeout
|
|
|
|
use_timeout = (test_timeout is not None)
|
2015-09-29 18:15:38 -03:00
|
|
|
|
|
|
|
workers = [MultiprocessThread(pending, output, regrtest.ns)
|
|
|
|
for i in range(regrtest.ns.use_mp)]
|
2016-03-24 07:55:29 -03:00
|
|
|
print("Run tests in parallel using %s child processes"
|
|
|
|
% len(workers))
|
2015-09-29 18:15:38 -03:00
|
|
|
for worker in workers:
|
|
|
|
worker.start()
|
2015-09-29 22:05:43 -03:00
|
|
|
|
|
|
|
def get_running(workers):
|
|
|
|
running = []
|
|
|
|
for worker in workers:
|
|
|
|
current_test = worker.current_test
|
|
|
|
if not current_test:
|
|
|
|
continue
|
|
|
|
dt = time.monotonic() - worker.start_time
|
|
|
|
if dt >= PROGRESS_MIN_TIME:
|
2018-06-01 06:04:45 -03:00
|
|
|
text = '%s (%s)' % (current_test, format_duration(dt))
|
|
|
|
running.append(text)
|
2015-09-29 22:05:43 -03:00
|
|
|
return running
|
|
|
|
|
2015-09-29 18:15:38 -03:00
|
|
|
finished = 0
|
|
|
|
test_index = 1
|
2016-03-22 22:04:32 -03:00
|
|
|
get_timeout = max(PROGRESS_UPDATE, PROGRESS_MIN_TIME)
|
2015-09-29 18:15:38 -03:00
|
|
|
try:
|
|
|
|
while finished < regrtest.ns.use_mp:
|
2016-03-22 22:04:32 -03:00
|
|
|
if use_timeout:
|
|
|
|
faulthandler.dump_traceback_later(test_timeout, exit=True)
|
|
|
|
|
2015-09-29 22:05:43 -03:00
|
|
|
try:
|
2016-03-22 22:04:32 -03:00
|
|
|
item = output.get(timeout=get_timeout)
|
2015-09-29 22:05:43 -03:00
|
|
|
except queue.Empty:
|
|
|
|
running = get_running(workers)
|
2015-10-02 20:20:49 -03:00
|
|
|
if running and not regrtest.ns.pgo:
|
2018-05-25 12:21:55 -03:00
|
|
|
print('running: %s' % ', '.join(running), flush=True)
|
2015-09-29 22:05:43 -03:00
|
|
|
continue
|
|
|
|
|
|
|
|
test, stdout, stderr, result = item
|
2015-09-29 18:15:38 -03:00
|
|
|
if test is None:
|
|
|
|
finished += 1
|
|
|
|
continue
|
|
|
|
regrtest.accumulate_result(test, result)
|
2015-09-29 19:33:29 -03:00
|
|
|
|
|
|
|
# Display progress
|
2018-09-18 13:10:26 -03:00
|
|
|
ok, test_time, xml_data = result
|
2016-05-20 08:37:40 -03:00
|
|
|
text = format_test_result(test, ok)
|
2015-09-29 19:33:29 -03:00
|
|
|
if (ok not in (CHILD_ERROR, INTERRUPTED)
|
2015-10-02 20:20:49 -03:00
|
|
|
and test_time >= PROGRESS_MIN_TIME
|
|
|
|
and not regrtest.ns.pgo):
|
2018-06-14 09:58:13 -03:00
|
|
|
text += ' (%s)' % format_duration(test_time)
|
2017-02-06 07:42:00 -04:00
|
|
|
elif ok == CHILD_ERROR:
|
|
|
|
text = '%s (%s)' % (text, test_time)
|
2015-09-29 22:05:43 -03:00
|
|
|
running = get_running(workers)
|
2015-10-02 20:20:49 -03:00
|
|
|
if running and not regrtest.ns.pgo:
|
2015-09-29 19:33:29 -03:00
|
|
|
text += ' -- running: %s' % ', '.join(running)
|
|
|
|
regrtest.display_progress(test_index, text)
|
|
|
|
|
|
|
|
# Copy stdout and stderr from the child process
|
2015-09-29 18:15:38 -03:00
|
|
|
if stdout:
|
2015-09-29 19:48:27 -03:00
|
|
|
print(stdout, flush=True)
|
2015-10-02 20:20:49 -03:00
|
|
|
if stderr and not regrtest.ns.pgo:
|
2015-09-29 19:48:27 -03:00
|
|
|
print(stderr, file=sys.stderr, flush=True)
|
2015-09-29 19:33:29 -03:00
|
|
|
|
2015-09-29 18:15:38 -03:00
|
|
|
if result[0] == INTERRUPTED:
|
|
|
|
raise KeyboardInterrupt
|
|
|
|
test_index += 1
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
regrtest.interrupted = True
|
|
|
|
pending.interrupted = True
|
2015-09-29 19:33:29 -03:00
|
|
|
print()
|
2016-03-22 22:04:32 -03:00
|
|
|
finally:
|
|
|
|
if use_timeout:
|
|
|
|
faulthandler.cancel_dump_traceback_later()
|
2015-09-29 19:33:29 -03:00
|
|
|
|
2016-03-24 08:04:15 -03:00
|
|
|
# If tests are interrupted, wait until tests complete
|
|
|
|
wait_start = time.monotonic()
|
|
|
|
while True:
|
|
|
|
running = [worker.current_test for worker in workers]
|
|
|
|
running = list(filter(bool, running))
|
|
|
|
if not running:
|
|
|
|
break
|
|
|
|
|
|
|
|
dt = time.monotonic() - wait_start
|
|
|
|
line = "Waiting for %s (%s tests)" % (', '.join(running), len(running))
|
|
|
|
if dt >= WAIT_PROGRESS:
|
|
|
|
line = "%s since %.0f sec" % (line, dt)
|
2018-05-25 12:21:55 -03:00
|
|
|
print(line, flush=True)
|
2016-03-24 08:04:15 -03:00
|
|
|
for worker in workers:
|
|
|
|
worker.join(WAIT_PROGRESS)
|