From 10464c3ae53438f6ca3c7f80dcc57ee766944165 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 27 Sep 2018 19:52:40 +0100 Subject: [PATCH] ostree-tests: Remove gjs dependency on s390x mozjs60 doesn't work on s390x, so gjs is in danger of being removed from that architecture (see #909536). The test that uses JS is automatically skipped if the interpreter is missing. --- debian/changelog | 9 +++++++++ debian/control | 2 +- debian/ostree-tests.lintian-overrides | 7 +++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 14986ec5..84c290e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ostree (2018.8-2) UNRELEASED; urgency=medium + + * ostree-tests: Remove gjs dependency on s390x. + mozjs60 doesn't work on s390x, so gjs is in danger of being removed + from that architecture (see #909536). The test that uses JS is + automatically skipped if the interpreter is missing. + + -- Simon McVittie Thu, 27 Sep 2018 19:45:55 +0100 + ostree (2018.8-1) unstable; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index 64ceea74..5acd2bbf 100644 --- a/debian/control +++ b/debian/control @@ -156,7 +156,7 @@ Depends: cpio, fuse, gir1.2-ostree-1.0, - gjs [!sparc64], + gjs [!s390x !sparc64], gnupg, ostree, python3, diff --git a/debian/ostree-tests.lintian-overrides b/debian/ostree-tests.lintian-overrides index 87efd11d..a39d35dd 100644 --- a/debian/ostree-tests.lintian-overrides +++ b/debian/ostree-tests.lintian-overrides @@ -6,8 +6,11 @@ ostree-tests: extra-license-file usr/libexec/installed-tests/libostree/gpg-verif # This is deliberate, working around the assumption of recursive make ostree-tests: symlink-is-self-recursive usr/libexec/installed-tests/libostree/tests . -# We won't run this on sparc64 currently -[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js) +# gjs has been broken on sparc64 for a while, and is likely to be removed +# from s390x because mozjs60 doesn't work there. +# The test that runs this script is automatically skipped if gjs isn't +# present. +[s390x sparc64]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js) # This shared object genuinely doesn't use any libc ABIs directly, # only via GLib