From efed403cd9500893b2ac573d2a9f8e5501db09f2 Mon Sep 17 00:00:00 2001
From: Alexander van der Grinten <alexander.vandergrinten@gmail.com>
Date: Thu, 5 Dec 2024 22:37:30 +0100
Subject: [PATCH] test-image: Use vm-util for test-image task

---
 bootstrap.d/tasks.y4.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bootstrap.d/tasks.y4.yml b/bootstrap.d/tasks.y4.yml
index 04e0da786..24a4fd2d9 100644
--- a/bootstrap.d/tasks.y4.yml
+++ b/bootstrap.d/tasks.y4.yml
@@ -128,13 +128,21 @@ tasks:
     containerless: true
 
   - name: test-image
+    tools_required:
+      - tool: ovmf
+        expose: false
     tasks_required:
       - task: make-image
         order_only: true
       - task: remake-image
         order_only: true
     args:
-      - '@SOURCE_ROOT@/scripts/test-image.py'
+      - '@SOURCE_ROOT@/scripts/vm-util.py'
+      - 'qemu'
+      - '--arch'
+      - '@OPTION:arch@'
+      - '--expect'
+      - "launching '/usr/libexec/weston-desktop-shell'"
     workdir: '@BUILD_ROOT@'
     containerless: true