From 50601e580ab90e3a1417fad484918e1d8f7b9593 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Mon, 11 Sep 2017 20:59:30 +0000 Subject: [PATCH] move testsuite related bits to override_dh_auto_test --- debian/rules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index a81f9b0598..7a17316ddd 100644 --- a/debian/rules +++ b/debian/rules @@ -111,6 +111,12 @@ ifneq ($(filter %-udeb,$(binaries)),) endif override_dh_auto_build: + dh_auto_build --builddirectory=debian/build/deb +ifneq ($(filter %-udeb,$(binaries)),) + dh_auto_build --builddirectory=debian/build/udeb +endif + +override_dh_auto_test: # Mark reftests with known failures as non-fatal touch testsuite/reftests/nonresizable-size.ui.known_fail touch testsuite/reftests/window-show-contents-on-map.ui.known_fail @@ -120,12 +126,6 @@ override_dh_auto_build: mkdir -p debian/build/glib-2.0/schemas/ cp gtk/org.gtk.* debian/build/glib-2.0/schemas/ glib-compile-schemas debian/build/glib-2.0/schemas/ - dh_auto_build --builddirectory=debian/build/deb -ifneq ($(filter %-udeb,$(binaries)),) - dh_auto_build --builddirectory=debian/build/udeb -endif - -override_dh_auto_test: # Remove LD_PRELOAD so we don't run with fakeroot, which makes dbus-related tests fail env -u LD_PRELOAD dh_auto_test --builddirectory=debian/build/deb -- -k check -j1