From beb1d6f362935de01752d9852bf9209bb594a132 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 15 Dec 2021 14:25:30 +0100 Subject: [PATCH] buildsys: drop hack that moved testing after dh_install the motivation for this was that we required to build some stuff with different feature flags before the big-split when openid (that still links to the dependency-greedy) got added, to avoid that binaries that do not use openid at all also got linked to its dependencies. This is now fixed since a bit and thus we should be able to drop the test-reorder hack. Signed-off-by: Thomas Lamprecht --- Makefile | 3 --- debian/rules | 3 --- 2 files changed, 6 deletions(-) diff --git a/Makefile b/Makefile index 6a38931f..a29cb2df 100644 --- a/Makefile +++ b/Makefile @@ -221,9 +221,6 @@ install: $(COMPILED_BINS) install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;) $(MAKE) -C www install $(MAKE) -C docs install -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - $(MAKE) test # HACK, only test now to avoid clobbering build files with wrong config -endif .PHONY: upload upload: ${SERVER_DEB} ${CLIENT_DEB} ${RESTORE_DEB} ${DOC_DEB} ${DEBUG_DEB} diff --git a/debian/rules b/debian/rules index 1a00a100..b13ba334 100755 --- a/debian/rules +++ b/debian/rules @@ -32,9 +32,6 @@ 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 \