me
/
guix
Archived
1
0
Fork 0

guix system: Do not use 'vm-image.tmpl' in tests.

This is a followup to 95a03aa5c5.  Since
that commit, merely evaluating 'vm-image.tmpl' would trigger the build
of 'current-guix' so skip it.

* tests/guix-system.sh: Do not try to build 'vm-image.tmpl'.
master
Ludovic Courtès 2022-09-04 19:20:14 +02:00
parent 9e59dbcd6c
commit f1bbb06dad
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 18 additions and 11 deletions

View File

@ -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