summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kastner <ckk@kvr.at>2021-01-15 11:06:10 +0100
committerLars Wirzenius <liw@liw.fi>2021-01-16 05:59:08 +0000
commitd2e1dad4d5061d067387660b2d6f7cf94b768874 (patch)
treedb6282a54f4b95f964d6315873a10235b752f377
parentf8f098f87d2d39006bbd7c9251ada9e939389209 (diff)
downloadvmdb2-d2e1dad4d5061d067387660b2d6f7cf94b768874.tar.gz
fix: Run amd64-native tests only when host=amd64
The test is for amd64 (as per the .yarn file), but image creation will fail on non-amd64 hosts (debootstrap vs. qemu-debootstrap).
-rwxr-xr-xcheck-all15
1 files changed, 9 insertions, 6 deletions
diff --git a/check-all b/check-all
index bf4bbb4..6b87cad 100755
--- a/check-all
+++ b/check-all
@@ -33,13 +33,16 @@ cd "$src"
#tryit lvm2.img "$src/lvm2.vmdb"; exit
-bash -x ./smoke.sh "$amd64_tarball"
-
-for x in "$@" pc uefi ansible smoke-pc smoke-uefi
-do
- tryit "$tarballdir/$x.img" "$x.vmdb" "$amd64_tarball"
-done
+# This uses debootstrap, not qemu-debootstrap. Hence, it only works on amd64
+if [ -x /usr/bin/dpkg ] && [ "$(dpkg --print-architecture)" = "amd64" ]
+then
+ bash -x ./smoke.sh "$amd64_tarball"
+ for x in "$@" pc uefi ansible smoke-pc smoke-uefi
+ do
+ tryit "$tarballdir/$x.img" "$x.vmdb" "$amd64_tarball"
+ done
+fi
if [ -e /usr/share/OVMF/OVMF32_VARS_4M.fd ]
then