Re-enable gjs tests on architectures where it is available

This commit is contained in:
Simon McVittie 2021-06-22 10:47:45 +01:00
parent a07fcd86d5
commit ad048c8b0a
3 changed files with 5 additions and 4 deletions

3
debian/control vendored
View File

@ -21,6 +21,7 @@ Build-Depends:
e2fslibs-dev,
elfutils,
fuse,
gjs [!alpha !hppa !ia64 !m68k !sh4 !sparc64 !x32],
gnupg <!nocheck>,
gobject-introspection,
gtk-doc-tools <!nodoc>,
@ -188,7 +189,7 @@ Depends:
cpio,
fuse,
gir1.2-ostree-1.0,
gjs [!sparc64],
gjs [!alpha !hppa !ia64 !m68k !sh4 !sparc64 !x32],
gnupg,
ostree,
python3,

View File

@ -6,10 +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 .
# gjs has been broken on sparc64 for a while.
# gjs has been broken on sparc64 for a while, and is missing on the
# other architectures mentioned here.
# The test that runs this script is automatically skipped if gjs isn't
# present.
[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
[alpha hppa ia64 m68k sh4 sparc64 x32]: 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

1
debian/rules vendored
View File

@ -11,7 +11,6 @@ override_dh_autoreconf:
env NOCONFIGURE=1 dh_autoreconf ./autogen.sh
configure_options = \
GJS=some-nonexistent-gjs-binary \
--enable-installed-tests \
--with-avahi \
--with-dracut \