From 7190cbf2ac775b2acc77d5dc16725fbc26420689 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 20 Jul 2021 19:58:03 +0200 Subject: [PATCH] buildsys: run test before compile to avoid clobbering the openid build binaries dh_auto_test also checks for the build flags used, including any `--cfg`, so it rebuilds and overwrites our carefully assembled daemon binaries with openid support as it is run after build and before install. So manually ensure the order of first test then build (argh, hackes of hackes >.<) Signed-off-by: Thomas Lamprecht --- Makefile | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Makefile b/Makefile index c3997ff1..4c398219 100644 --- a/Makefile +++ b/Makefile @@ -205,6 +205,7 @@ install: $(COMPILED_BINS) install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;) $(MAKE) -C www install $(MAKE) -C docs install + $(MAKE) test # HACK, only test now to avoid clobbering build files with wrong config .PHONY: upload upload: ${SERVER_DEB} ${CLIENT_DEB} ${RESTORE_DEB} ${DOC_DEB} diff --git a/debian/rules b/debian/rules index b13ba334..1a00a100 100755 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,9 @@ override_dh_auto_build: override_dh_missing: dh_missing --fail-missing +override_dh_auto_test: + # ignore here to avoid rebuilding the binaries with the wrong target + override_dh_auto_install: dh_auto_install -- \ PROXY_USER=backup \