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.
This commit is contained in:
Simon McVittie 2018-09-27 19:52:40 +01:00
parent ae8e6a3da3
commit 10464c3ae5
3 changed files with 15 additions and 3 deletions

9
debian/changelog vendored
View File

@ -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 <smcv@debian.org> Thu, 27 Sep 2018 19:45:55 +0100
ostree (2018.8-1) unstable; urgency=medium ostree (2018.8-1) unstable; urgency=medium
* New upstream release * New upstream release

2
debian/control vendored
View File

@ -156,7 +156,7 @@ Depends:
cpio, cpio,
fuse, fuse,
gir1.2-ostree-1.0, gir1.2-ostree-1.0,
gjs [!sparc64], gjs [!s390x !sparc64],
gnupg, gnupg,
ostree, ostree,
python3, python3,

View File

@ -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 # This is deliberate, working around the assumption of recursive make
ostree-tests: symlink-is-self-recursive usr/libexec/installed-tests/libostree/tests . ostree-tests: symlink-is-self-recursive usr/libexec/installed-tests/libostree/tests .
# We won't run this on sparc64 currently # gjs has been broken on sparc64 for a while, and is likely to be removed
[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js) # 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, # This shared object genuinely doesn't use any libc ABIs directly,
# only via GLib # only via GLib