Skip test-sysroot.js on s390x

Mitigates: #1025532
This commit is contained in:
Simon McVittie committed 2022-12-06 11:08:51 +00:00
1 parent b1232248f8
commit 0f32888091
6 files changed
+66 -3

No files matched your search

+6 -1
View File
@@ -1,4 +1,9 @@
Tests: flaky
Tests: flaky-concurrency
Restrictions: flaky
Depends: gnome-desktop-testing, ostree-tests
Tests: flaky-sysroot
Architecture: s390x
Restrictions: flaky
Depends: gnome-desktop-testing, ostree-tests
View File
File renamed without changes.
+12
View File
@@ -0,0 +1,12 @@
#!/bin/sh
set -e
exec 2>&1
unset ftp_proxy
unset http_proxy
unset https_proxy
unset no_proxy
export DEB_ALLOW_FLAKY_TESTS=1
exec gnome-desktop-testing-runner libostree/test-sysroot.js.test
+16 -1
View File
@@ -11,7 +11,9 @@ unset http_proxy
unset https_proxy
unset no_proxy
tests="$(gnome-desktop-testing-runner -l libostree | while read -r t; do
namespace=libostree/
tests="$(gnome-desktop-testing-runner -l "$namespace" | while read -r t; do
t="${t%% *}"
case "$t" in
@@ -20,11 +22,24 @@ tests="$(gnome-desktop-testing-runner -l libostree | while read -r t; do
# https://github.com/ostreedev/ostree/issues/1620
continue
;;
(libostree/test-sysroot.js.test)
# https://bugs.debian.org/1025532
# https://github.com/ostreedev/ostree/issues/2527
if [ "${DEB_HOST_ARCH-}" = s390x ] || [ "$(uname -m)" = s390x ]; then
continue
fi
;;
esac
echo "$t"
done)"
if [ -z "$tests" ]; then
echo "Error: no installed-tests found matching $namespace" >&2
exit 1
fi
# Deliberately word-splitting
# shellcheck disable=SC2046
exec gnome-desktop-testing-runner $tests