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

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit af2ca0226fbb68d9228f286c19ddd3b84d07575f
Author: Ludovic Courtès <l...@gnu.org>
AuthorDate: Thu Jun 13 22:34:00 2024 +0200

    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
---
 tests/guix-system.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/guix-system.sh b/tests/guix-system.sh
index 29e490c3d4..99147cf332 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 <l...@gnu.org>
+# Copyright © 2014-2022, 2024 Ludovic Courtès <l...@gnu.org>
 # Copyright © 2017 Tobias Geerinckx-Rice <m...@tobias.gr>
 # Copyright © 2018 Chris Marusich <cmmarus...@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.