Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: Don't even start running skipped tests

This commit is contained in:
Daniel Mensinger 2021-06-08 22:59:54 +02:00
parent 30ff36dc91
commit 7fac515acf
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
run_project_tests.py
View File

@ -570,12 +570,12 @@ def run_test(test: TestDef,
should_fail: str, should_fail: str,
use_tmp: bool, use_tmp: bool,
state: T.Optional[GlobalState] = None) -> T.Optional[TestResult]: state: T.Optional[GlobalState] = None) -> T.Optional[TestResult]:
if test.skip:
return None
# Unpack the global state # Unpack the global state
global compile_commands, clean_commands, test_commands, install_commands, uninstall_commands, backend, backend_flags, host_c_compiler global compile_commands, clean_commands, test_commands, install_commands, uninstall_commands, backend, backend_flags, host_c_compiler
if state is not None: if state is not None:
compile_commands, clean_commands, test_commands, install_commands, uninstall_commands, backend, backend_flags, host_c_compiler = state compile_commands, clean_commands, test_commands, install_commands, uninstall_commands, backend, backend_flags, host_c_compiler = state
# Setup the test environment
assert not test.skip, 'Skipped thest should not be run'
build_dir = create_deterministic_builddir(test, use_tmp) build_dir = create_deterministic_builddir(test, use_tmp)
try: try:
with TemporaryDirectoryWinProof(prefix='i ', dir=None if use_tmp else os.getcwd()) as install_dir: with TemporaryDirectoryWinProof(prefix='i ', dir=None if use_tmp else os.getcwd()) as install_dir:
@ -1117,16 +1117,16 @@ def default_print(*args: mlog.TV_Loggable, sep: str = ' ') -> None:
safe_print = default_print safe_print = default_print
class TestRunFuture: class TestRunFuture:
def __init__(self, name: str, testdef: TestDef, future: 'Future[T.Optional[TestResult]]') -> None: def __init__(self, name: str, testdef: TestDef, future: T.Optional['Future[T.Optional[TestResult]]']) -> None:
super().__init__() super().__init__()
self.name = name self.name = name
self.testdef = testdef self.testdef = testdef
self.future = future self.future = future
self.status = TestStatus.RUNNING self.status = TestStatus.RUNNING if self.future is not None else TestStatus.SKIP
@property @property
def result(self) -> T.Optional[TestResult]: def result(self) -> T.Optional[TestResult]:
return self.future.result() return self.future.result() if self.future else None
def log(self) -> None: def log(self) -> None:
without_install = '' if install_commands else '(without install)' without_install = '' if install_commands else '(without install)'
@ -1137,7 +1137,7 @@ class TestRunFuture:
self.log() self.log()
def cancel(self) -> None: def cancel(self) -> None:
if self.future.cancel(): if self.future is not None and self.future.cancel():
self.status = TestStatus.CANCELED self.status = TestStatus.CANCELED
class LogRunFuture: class LogRunFuture:
@ -1201,7 +1201,9 @@ def _run_tests(all_tests: T.List[T.Tuple[str, T.List[TestDef], bool]],
suite_args = ['--fatal-meson-warnings'] suite_args = ['--fatal-meson-warnings']
should_fail = name.split('warning-')[1] should_fail = name.split('warning-')[1]
t.skip = skipped or t.skip if skipped or t.skip:
futures += [TestRunFuture(testname, t, None)]
continue
result_future = executor.submit(run_test, t, extra_args + suite_args + t.args, should_fail, use_tmp, state=state) result_future = executor.submit(run_test, t, extra_args + suite_args + t.args, should_fail, use_tmp, state=state)
futures += [TestRunFuture(testname, t, result_future)] futures += [TestRunFuture(testname, t, result_future)]