diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-11-20 09:11:49 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2024-12-19 09:25:20 -0800 |
| commit | eb35d1a05f08f6969851cea81889e3beffdb9ec2 (patch) | |
| tree | 12cb71157c0fec16c74a9c5e750b0c1528973838 | |
| parent | 193715b920750a6bab41b691cb7de25bf39dce53 (diff) | |
| download | meson-eb35d1a05f08f6969851cea81889e3beffdb9ec2.tar.gz | |
mtest: do not import from mintro
import mintro and its attendant module dependency tree just
so we can programmatically get filenames which are documented
as a stable API in https://mesonbuild.com/IDE-integration.html.
Suggested-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | mesonbuild/mtest.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index 27e0f796a..d41c676ef 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -38,7 +38,6 @@ from .coredata import version as coredata_version from .mesonlib import (MesonException, OrderedSet, RealPathAction, get_wine_shortpath, join_args, split_args, setup_vsenv) from .options import OptionKey -from .mintro import get_infodir, load_info_file from .programs import ExternalProgram from .backend.backends import TestProtocol, TestSerialisation @@ -2158,10 +2157,14 @@ def rebuild_deps(ninja: T.List[str], wd: str, tests: T.List[TestSerialisation]) assert len(ninja) > 0 + targets_file = os.path.join(wd, 'meson-info/intro-targets.json') + with open(targets_file, encoding='utf-8') as fp: + targets_info = json.load(fp) + depends: T.Set[str] = set() targets: T.Set[str] = set() intro_targets: T.Dict[str, T.List[str]] = {} - for target in load_info_file(get_infodir(wd), kind='targets'): + for target in targets_info: intro_targets[target['id']] = [ convert_path_to_target(f) for f in target['filename']] |