aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/guix-system.sh29
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