summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2022-08-31 21:50:15 +0100
committerSimon McVittie <smcv@debian.org>2022-08-31 23:06:00 +0100
commitdfeaeeaa4e89dde25b268428ed8f6f08729d3404 (patch)
treea164a84c3d6c79c74936298c2e1247ff2ae3d329
parent3fbc8bda1254130e1c947df99e1ac5c1548dcddd (diff)
d/rules: Disable AT-SPI bridge during testing
It seems that connecting to the accessibility bus frequently fails during build-time testing, resulting in warnings that are sometimes treated as fatal. This isn't core functionality for libglade, so disable it.
-rwxr-xr-xdebian/rules2
-rwxr-xr-xdebian/tests/gir1.2-gladeui-2.02
-rwxr-xr-xdebian/tests/libgladeui-dev2
3 files changed, 4 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules
index 7bb589f5..987ec774 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ endif
override_dh_auto_configure:
dh_auto_configure -- -Dauto_features=enabled $(ENABLE_DOCS) $(ENABLE_WEBKIT) $(ENABLE_GJS)
-TEST_COMMAND = dh_auto_test -- --wrap="dbus-run-session -- xvfb-run -a" \
+TEST_COMMAND = NO_AT_BRIDGE=1 dh_auto_test -- --wrap="dbus-run-session -- xvfb-run -a" \
--timeout-multiplier 5
override_dh_auto_test:
diff --git a/debian/tests/gir1.2-gladeui-2.0 b/debian/tests/gir1.2-gladeui-2.0
index 4f57d58d..ca30a5fb 100755
--- a/debian/tests/gir1.2-gladeui-2.0
+++ b/debian/tests/gir1.2-gladeui-2.0
@@ -1,6 +1,8 @@
#!/bin/sh
set -eux
+export NO_AT_BRIDGE=1
+
dbus-run-session -- xvfb-run -a python3 <<EOF
import gi
gi.require_version("Gladeui", "2.0")
diff --git a/debian/tests/libgladeui-dev b/debian/tests/libgladeui-dev
index 23137d11..4a142003 100755
--- a/debian/tests/libgladeui-dev
+++ b/debian/tests/libgladeui-dev
@@ -39,5 +39,5 @@ EOF
"${CROSS_COMPILE}gcc" -o glade glade.c $("${CROSS_COMPILE}pkg-config" --cflags --libs gladeui-2.0)
echo "build: OK"
[ -x ./glade ]
-dbus-run-session -- xvfb-run -a ./glade
+NO_AT_BRIDGE=1 dbus-run-session -- xvfb-run -a ./glade
echo "run: OK"