From 6c4c4bef41e529e81831e4f4bcad3a3d85f37e60 Mon Sep 17 00:00:00 2001 From: Johannes 'josch' Schauer Date: Wed, 24 Jun 2020 23:11:03 +0200 Subject: [PATCH] coverage.sh: comparing amd64 with i386 should only be done with RUN_MA_SAME_TESTS = yes --- coverage.sh | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/coverage.sh b/coverage.sh index 2f61baa..eee4cdd 100755 --- a/coverage.sh +++ b/coverage.sh @@ -1490,14 +1490,21 @@ $CMD --mode=$defaultmode --variant=apt --architectures=i386 $DEFAULT_DIST /tmp/d } | sort | diff -u - tar2.txt rm /tmp/debian-chroot.tar END -if [ "$HOSTARCH" != amd64 ]; then - echo "HOSTARCH != amd64 -- Skipping test..." >&2 - skipped=$((skipped+1)) -elif [ "$HAVE_QEMU" = "yes" ]; then - ./run_qemu.sh - runtests=$((runtests+1)) +# this test compares the contents of different architectures, so this might +# fail if the versions do not match +if [ "$RUN_MA_SAME_TESTS" = "yes" ]; then + if [ "$HOSTARCH" != amd64 ]; then + echo "HOSTARCH != amd64 -- Skipping test..." >&2 + skipped=$((skipped+1)) + elif [ "$HAVE_QEMU" = "yes" ]; then + ./run_qemu.sh + runtests=$((runtests+1)) + else + echo "HAVE_QEMU != yes -- Skipping test..." >&2 + skipped=$((skipped+1)) + fi else - echo "HAVE_QEMU != yes -- Skipping test..." >&2 + echo "RUN_MA_SAME_TESTS != yes -- Skipping test..." >&2 skipped=$((skipped+1)) fi