From fcfe6875c4315b78e1c6ce85ae1d19e382a27a42 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 14 Jan 2025 13:31:39 +0000 Subject: [PATCH] Add test coverage for the historical path of gtk-query-immodules-3.0 --- debian/rules | 3 +++ debian/tests/installed-tests | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 0054b530f1..605c9df060 100755 --- a/debian/rules +++ b/debian/rules @@ -248,6 +248,9 @@ endif override_dh_install: dh_install -p$(UDEB_PKG) --sourcedir=debian/install/udeb dh_install --remaining-packages --sourcedir=debian/install/deb +ifneq ($(filter $(EXAMPLES_PKG),$(built_binaries)),) + printf '%s\n' "${DEB_HOST_MULTIARCH}" > debian/$(EXAMPLES_PKG)/usr/libexec/installed-tests/gtk+/DEB_HOST_MULTIARCH +endif # debhelper >= 13.4 makes all of /usr/libexec executable, which is not # quite right for installed-tests diff --git a/debian/tests/installed-tests b/debian/tests/installed-tests index 0bc3d3163f..55c86058d2 100755 --- a/debian/tests/installed-tests +++ b/debian/tests/installed-tests @@ -2,7 +2,7 @@ # autopkgtest check: Run the installed-tests to verify GTK works correctly # Based on glib2.0's d/tests/installed-tests, (C) 2013 Canonical Ltd. -set -e +set -ex # Disable gvfs if it happens to be installed. We want to test the built-in # stuff @@ -14,6 +14,11 @@ export XDG_RUNTIME_DIR="$AUTOPKGTEST_TMP" # Workaround for #1025312 export LIBGL_ALWAYS_SOFTWARE=1 +DEB_HOST_MULTIARCH="$(cat /usr/libexec/installed-tests/gtk+/DEB_HOST_MULTIARCH)" +# Some packages (gcin, hime, ibus) rely on being able to run +# gtk-query-immmodules by this path; make sure they won't regress +"/usr/lib/${DEB_HOST_MULTIARCH}/libgtk-3-0/gtk-query-immodules-3.0" + tests=$(gnome-desktop-testing-runner -l gtk+ | cut -f1 -d' ' | grep -v '^gtk./a11ystate.test$' |