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 <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index c3997ff17c654ca2e7f93e6bcb77535a36c09364..4c398219b03c9030c8ddf0d2d87de02286d844c2 100644 (file)
--- 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 b13ba3348815771199f86c315b8051b250b6d034..1a00a10034aef2fe6afc67db89ac5484e58ad858 100755 (executable)
--- 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 \