diff options
| author | Marius Bakke <marius@gnu.org> | 2022-09-08 21:12:52 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-09-08 21:12:52 +0200 |
| commit | 884548b476f2ee27c01cb0c9ad93c0cf9d33fa5e (patch) | |
| tree | 20650b3917b1292470ecc4ded13fbb04e5dbfa6d /tests/guix-system.sh | |
| parent | 0e305798454c558ab6e722cf66ba351c326a1a8d (diff) | |
| parent | fa894b3f4db835bd0bb52b32c7ec412e72b7e03a (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'tests/guix-system.sh')
| -rw-r--r-- | tests/guix-system.sh | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 044fd131d6..f76a5ce119 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -335,22 +335,29 @@ rm "$tmpdir/search" # Verify that the examples can be built. for example in gnu/system/examples/*.tmpl; do - if echo "$example" | grep hurd; then - options="--target=i586-pc-gnu" - elif echo "$example" | grep asus; then - # 'asus-c201.tmpl' uses 'linux-libre-arm-generic', which is an - # ARM-only package. - options="--system=armhf-linux" - else - options="" - fi + case "$example" in + *hurd*) + options="--target=i586-pc-gnu";; + *asus*) + # 'asus-c201.tmpl' uses 'linux-libre-arm-generic', which is an + # ARM-only package. + options="--system=armhf-linux";; + *vm-image*) + # The VM image tries to build 'current-guix' as per 'guix pull'. + # Skip it. + continue + ;; + *) + options="" + ;; + esac guix system -n disk-image $options "$example" done # Verify that the images can be built. -guix system -n vm gnu/system/examples/vm-image.tmpl +guix system -n vm gnu/system/examples/bare-bones.tmpl guix system -n image gnu/system/images/pinebook-pro.scm -guix system -n image -t qcow2 gnu/system/examples/vm-image.tmpl +guix system -n image -t qcow2 gnu/system/examples/bare-bones.tmpl guix system -n image -t iso9660 gnu/system/examples/bare-bones.tmpl guix system -n docker-image gnu/system/examples/docker-image.tmpl |