josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

coverage.sh: comparing amd64 with i386 should only be done with RUN_MA_SAME_TESTS = yes

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2020-06-24 23:11:03 +02:00
parent c633a9ac0d
commit 6c4c4bef41
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
coverage.sh
View file

@ -1490,6 +1490,9 @@ $CMD --mode=$defaultmode --variant=apt --architectures=i386 $DEFAULT_DIST /tmp/d
} | sort | diff -u - tar2.txt } | sort | diff -u - tar2.txt
rm /tmp/debian-chroot.tar rm /tmp/debian-chroot.tar
END END
# 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 if [ "$HOSTARCH" != amd64 ]; then
echo "HOSTARCH != amd64 -- Skipping test..." >&2 echo "HOSTARCH != amd64 -- Skipping test..." >&2
skipped=$((skipped+1)) skipped=$((skipped+1))
@ -1500,6 +1503,10 @@ else
echo "HAVE_QEMU != yes -- Skipping test..." >&2 echo "HAVE_QEMU != yes -- Skipping test..." >&2
skipped=$((skipped+1)) skipped=$((skipped+1))
fi fi
else
echo "RUN_MA_SAME_TESTS != yes -- Skipping test..." >&2
skipped=$((skipped+1))
fi
# to test foreign architecture package installation we choose a package which # to test foreign architecture package installation we choose a package which
# - is not part of the native installation set # - is not part of the native installation set