ostree-tests: Depend on gjs on s390x again

mozjs and gjs are believed to work fine on s390x now.
This commit is contained in:
Simon McVittie 2020-08-21 00:24:06 +01:00
parent 64afd2cb09
commit 0179d21aed
3 changed files with 5 additions and 4 deletions

2
debian/changelog vendored
View File

@ -1,6 +1,8 @@
ostree (2020.5-1) UNRELEASED; urgency=medium ostree (2020.5-1) UNRELEASED; urgency=medium
* New upstream release * New upstream release
* ostree-tests: Depend on gjs on s390x again.
mozjs and gjs are believed to work fine on s390x now.
-- Simon McVittie <smcv@debian.org> Fri, 21 Aug 2020 00:20:29 +0100 -- Simon McVittie <smcv@debian.org> Fri, 21 Aug 2020 00:20:29 +0100

2
debian/control vendored
View File

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

View File

@ -6,11 +6,10 @@ 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 .
# gjs has been broken on sparc64 for a while, and is likely to be removed # gjs has been broken on sparc64 for a while.
# from s390x because mozjs60 doesn't work there.
# The test that runs this script is automatically skipped if gjs isn't # The test that runs this script is automatically skipped if gjs isn't
# present. # present.
[s390x sparc64]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js) [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