Skip test-sysroot.js on s390x

Mitigates: #1025532
2022-12-06 11:08:51 +00:00
1 parent b1232248f8
commit 0f32888091
@@ -0,0 +1,30 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Tue, 6 Dec 2022 10:59:33 +0000
+Subject: test-sysroot: Skip on s390x by default
+
+This test regularly fails on the buildds, but I cannot reproduce the
+failure on a porterbox.
+
+Bug: https://github.com/ostreedev/ostree/issues/2527
+Bug-Debian: https://bugs.debian.org/1025532
+Forwarded: not-needed
+---
+ tests/test-sysroot.js | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tests/test-sysroot.js b/tests/test-sysroot.js
+index d4f67ef..0855b3d 100755
+--- a/tests/test-sysroot.js
+++ b/tests/test-sysroot.js
+@@ -38,6 +38,11 @@ function libtestExec(shellCode) {
+     proc.wait_check(null);
+ }
+ 
+if (GLib.getenv('DEB_HOST_ARCH') === 's390x' && !GLib.getenv('DEB_ALLOW_FLAKY_TESTS')) {
+    print('1..0 # SKIP https://bugs.debian.org/1025532');
+    imports.system.exit(0);
+}
+
+ print('1..1')
+ 
+ libtestExec('setup_os_repository archive syslinux');
@@ -1,2 +1,3 @@
-debian/Skip-test-pull-repeated-during-CI.patch
 configure-use-pkg-config-with-newer-gpgme-and-gpg-error.patch
+debian/Skip-test-pull-repeated-during-CI.patch
+debian/test-sysroot-Skip-on-s390x-by-default.patch