test: Various mkosi integration test improvements

[thirdparty/systemd.git] / meson.build

diff --git a/meson.build b/meson.build
index e2de14809521a4f6db30ce3b5669d6e0b1754f51..6397ee2e64ebe03cd8e1c6071bc51bd25b0da9b4 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2573,13 +2573,27 @@ endif
 
 #####################################################################
 
-if get_option('integration-tests') != false
-        system_mkosi = custom_target('system_mkosi',
+mkosi = find_program('mkosi', required : false)
+if mkosi.found()
+        custom_target('mkosi',
                 build_always_stale : true,
-                output : 'system',
+                build_by_default: false,
                 console : true,
-                command : ['mkosi', '-C', meson.project_source_root(), '--image=system', '--format=disk', '--output-dir', meson.project_build_root() / '@OUTPUT@', '--without-tests', '-fi', 'build'],
-                depends : [executables_by_name['bootctl'], executables_by_name['systemd-measure'], executables_by_name['systemd-repart'], ukify],
+                output : '.',
+                command : [
+                        'mkosi',
+                        '--directory', meson.current_source_dir(),
+                        '--output-dir', meson.current_build_dir() / 'mkosi.output',
+                        '--cache-dir', meson.current_build_dir() / 'mkosi.cache',
+                        '--build-dir', meson.current_build_dir() / 'mkosi.builddir',
+                        '--force',
+                        'build'
+                ],
+                depends : public_programs + [
+                        executables_by_name['systemd-journal-remote'],
+                        executables_by_name['systemd-measure'],
+                        ukify,
+                ],
         )
 endif