meson: Look up mkosi once

diff --git a/meson.build b/meson.build
index dfea903b60e08009965c9c25c579f99db7fe46c0..e071d58e11f6356c7abe61d0e3ef0698f1e4e678 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2626,7 +2626,7 @@ if mkosi.found()
                 console : true,
                 output : '.',
                 command : [
-                        'mkosi',
+                        mkosi,
                         '--directory', meson.current_source_dir(),
                         '--output-dir', meson.current_build_dir() / 'mkosi.output',
                         '--cache-dir', meson.current_build_dir() / 'mkosi.cache',

diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index 55a45307e278e3e1c5a7c14c691871eecea4fb3d..c84296d8164e0eef93d825d9d226c40df2a7908f 100755 (executable)
--- a/test/integration-test-wrapper.py
+++ b/test/integration-test-wrapper.py
@@ -40,6 +40,7 @@ ExecStart=false
 
 def main():
     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-build-dir', required=True, type=Path)
     parser.add_argument('--name', required=True)
@@ -102,7 +103,7 @@ def main():
         journal_file = None
 
     cmd = [
-        'mkosi',
+        args.mkosi,
         '--directory', os.fspath(args.meson_source_dir),
         '--output-dir', os.fspath(args.meson_build_dir / 'mkosi.output'),
         '--extra-search-path', os.fspath(args.meson_build_dir),
@@ -165,7 +166,7 @@ def main():
             j = json.loads(
                 subprocess.run(
                     [
-                        "mkosi",
+                        args.mkosi,
                         "--directory", os.fspath(args.meson_source_dir),
                         "--json",
                         "summary",

diff --git a/test/meson.build b/test/meson.build
index bb91ec8875ff9591c9e56d280a2e7a331e488e3b..5c15ade344c4c4ca58a8535de2cb27f49df8f545 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -407,7 +407,11 @@ foreach integration_test : integration_tests
                 integration_test_args += ['--slow']
         endif
 
-        integration_test_args += ['--']
+        if not mkosi.found()
+                continue
+        endif
+
+        integration_test_args += ['--mkosi', mkosi.full_path(), '--']
 
         if integration_test['cmdline'].length() > 0
                 integration_test_args += [