mirror of
https://github.com/systemd/systemd
synced 2024-10-04 15:21:01 +00:00
meson: Look up mkosi once
This commit is contained in:
parent
cafe40ec82
commit
e2f9f3409a
|
@ -2626,7 +2626,7 @@ if mkosi.found()
|
||||||
console : true,
|
console : true,
|
||||||
output : '.',
|
output : '.',
|
||||||
command : [
|
command : [
|
||||||
'mkosi',
|
mkosi,
|
||||||
'--directory', meson.current_source_dir(),
|
'--directory', meson.current_source_dir(),
|
||||||
'--output-dir', meson.current_build_dir() / 'mkosi.output',
|
'--output-dir', meson.current_build_dir() / 'mkosi.output',
|
||||||
'--cache-dir', meson.current_build_dir() / 'mkosi.cache',
|
'--cache-dir', meson.current_build_dir() / 'mkosi.cache',
|
||||||
|
|
|
@ -40,6 +40,7 @@ ExecStart=false
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
parser = argparse.ArgumentParser(description=__doc__)
|
parser = argparse.ArgumentParser(description=__doc__)
|
||||||
|
parser.add_argument('--mkosi', required=True)
|
||||||
parser.add_argument('--meson-source-dir', required=True, type=Path)
|
parser.add_argument('--meson-source-dir', required=True, type=Path)
|
||||||
parser.add_argument('--meson-build-dir', required=True, type=Path)
|
parser.add_argument('--meson-build-dir', required=True, type=Path)
|
||||||
parser.add_argument('--name', required=True)
|
parser.add_argument('--name', required=True)
|
||||||
|
@ -102,7 +103,7 @@ def main():
|
||||||
journal_file = None
|
journal_file = None
|
||||||
|
|
||||||
cmd = [
|
cmd = [
|
||||||
'mkosi',
|
args.mkosi,
|
||||||
'--directory', os.fspath(args.meson_source_dir),
|
'--directory', os.fspath(args.meson_source_dir),
|
||||||
'--output-dir', os.fspath(args.meson_build_dir / 'mkosi.output'),
|
'--output-dir', os.fspath(args.meson_build_dir / 'mkosi.output'),
|
||||||
'--extra-search-path', os.fspath(args.meson_build_dir),
|
'--extra-search-path', os.fspath(args.meson_build_dir),
|
||||||
|
@ -165,7 +166,7 @@ def main():
|
||||||
j = json.loads(
|
j = json.loads(
|
||||||
subprocess.run(
|
subprocess.run(
|
||||||
[
|
[
|
||||||
"mkosi",
|
args.mkosi,
|
||||||
"--directory", os.fspath(args.meson_source_dir),
|
"--directory", os.fspath(args.meson_source_dir),
|
||||||
"--json",
|
"--json",
|
||||||
"summary",
|
"summary",
|
||||||
|
|
|
@ -407,7 +407,11 @@ foreach integration_test : integration_tests
|
||||||
integration_test_args += ['--slow']
|
integration_test_args += ['--slow']
|
||||||
endif
|
endif
|
||||||
|
|
||||||
integration_test_args += ['--']
|
if not mkosi.found()
|
||||||
|
continue
|
||||||
|
endif
|
||||||
|
|
||||||
|
integration_test_args += ['--mkosi', mkosi.full_path(), '--']
|
||||||
|
|
||||||
if integration_test['cmdline'].length() > 0
|
if integration_test['cmdline'].length() > 0
|
||||||
integration_test_args += [
|
integration_test_args += [
|
||||||
|
|
Loading…
Reference in a new issue