tests: Adjust ‘guix system’ test for EFI bootloader.

This is a followup to e5078ff3210f4a9863b641a60430b2cb3c9c15ee, which
broke this test:

  $ guix system disk-image -n gnu/system/examples/desktop.tmpl
  guix system: warning: 'disk-image' is deprecated: use 'image' instead
  guix system: error: EFI bootloader required with GPT partitioning

* tests/guix-system.sh: Use ‘guix system image’ instead of ‘guix system
disk-image’.  Pass ‘-t efi-raw’ for ‘desktop.tmpl’.

Change-Id: I6877085ab33d9e8b471315b806fed22a7d1241a3

1 files changed, 8 insertions, 3 deletions

diff --git a/tests/guix-system.sh b/tests/guix-system.sh
index 29e490c3d48..99147cf332c 100644
--- a/tests/guix-system.sh
+++ b/tests/guix-system.sh
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2014-2022 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2014-2022, 2024 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 # Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
 #
@@ -355,17 +355,22 @@ for example in gnu/system/examples/*.tmpl; do
             # Skip it.
             continue
             ;;
+        *desktop*)
+            # This image uses 'grub-efi-bootloader' so it needs a GPT
+            # partition.
+            options="-t efi-raw --system=x86_64-linux";;
         *)
             options=""
             ;;
     esac
-    guix system -n disk-image $options "$example"
+    guix system -n image $options "$example"
 done
 
 # Make sure the desktop image can be built on major architectures.
 for system in x86_64-linux aarch64-linux
 do
-    guix system -n image -s "$system" gnu/system/examples/desktop.tmpl
+    guix system -n image -s "$system" -t efi-raw \
+         gnu/system/examples/desktop.tmpl
 done
 
 # Verify that the images can be built.