pull/8968/head
Eli Schwartz 4 years ago committed by Jussi Pakkanen
parent 88bd4e6e10
commit c4f5f6364e
  1. 2
      mesonbuild/interpreter/interpreterobjects.py
  2. 2
      run_project_tests.py

@ -132,7 +132,7 @@ class FeatureOptionHolder(ObjectHolder[coredata.UserFeatureOption]):
assert isinstance(error_message, str)
if self.value == 'enabled':
prefix = 'Feature {} cannot be enabled'.format(self.held_object.name)
prefix = f'Feature {self.held_object.name} cannot be enabled'
prefix = prefix + ': ' if error_message else ''
raise InterpreterException(prefix + error_message)
return self.as_disabled()

@ -1106,7 +1106,7 @@ def detect_tests_to_run(only: T.Dict[str, T.List[str]], use_tmp: bool) -> T.List
if only:
for key in only.keys():
assert key in categories, 'key `{}` is not a recognized category'.format(key)
assert key in categories, f'key `{key}` is not a recognized category'
all_tests = [t for t in all_tests if t.category in only.keys()]
gathered_tests = [(t.category, gather_tests(Path('test cases', t.subdir), t.stdout_mandatory, only[t.category]), t.skip) for t in all_tests]

Loading…
Cancel
Save