From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 14 Sep 2017 13:39:35 +0000 (+0200)
Subject: pkgs: print test suite log on failure
X-Git-Tag: rec-4.1.0-rc1~31^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65cd099c29e25e7a6bd3b3024451c9631ceab227;p=pdns

pkgs: print test suite log on failure
---

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index 73109fd10..a02575c24 100755
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -394,7 +394,7 @@ make install DESTDIR=%{buildroot}
 chmod 600 %{buildroot}%{_sysconfdir}/%{name}/pdns.conf
 
 %check
-make %{?_smp_mflags} -C pdns check
+make %{?_smp_mflags} -C pdns check || (cat pdns/test-suite.log && false)
 
 %pre
 getent group pdns >/dev/null || groupadd -r pdns
@@ -704,7 +704,7 @@ chmod 600 %{buildroot}%{_sysconfdir}/%{name}/pdns.conf
 %{__mv} %{buildroot}/%{_mandir}/man1/zone2ldap.1 %{buildroot}/%{_mandir}/man1/pdns-zone2ldap.1
 
 %check
-make %{?_smp_mflags} -C pdns check
+make %{?_smp_mflags} -C pdns check || (cat pdns/test-suite.log && false)
 
 %pre
 getent group pdns >/dev/null || groupadd -r pdns
@@ -983,7 +983,7 @@ chmod 600 %{buildroot}%{_sysconfdir}/%{name}/pdns.conf
 %{__mv} %{buildroot}/%{_mandir}/man1/zone2ldap.1 %{buildroot}/%{_mandir}/man1/pdns-zone2ldap.1
 
 %check
-make %{?_smp_mflags} -C pdns check
+make %{?_smp_mflags} -C pdns check || (cat pdns/test-suite.log && false)
 
 %pre
 getent group pdns >/dev/null || groupadd -r pdns
diff --git a/build-scripts/build-dnsdist-rpm b/build-scripts/build-dnsdist-rpm
index afff087da..5effa8e89 100755
--- a/build-scripts/build-dnsdist-rpm
+++ b/build-scripts/build-dnsdist-rpm
@@ -141,6 +141,9 @@ ${SETUP}
 
 make
 
+%check
+make %{?_smp_mflags} check || (cat test-suite.log && false)
+
 %install
 %make_install
 install -d %{buildroot}/%{_sysconfdir}/dnsdist
diff --git a/build-scripts/build-recursor-rpm b/build-scripts/build-recursor-rpm
index 440a7d9e6..48b58b250 100755
--- a/build-scripts/build-recursor-rpm
+++ b/build-scripts/build-recursor-rpm
@@ -136,6 +136,9 @@ package if you need a dns cache for your network.
 
 make %{?_smp_mflags} LIBRARY_PATH=/usr/lib64/boost148
 
+%check
+make %{?_smp_mflags} check || (cat test-suite.log && false)
+
 %install
 %{__rm} -rf %{buildroot}
 make install DESTDIR=%{buildroot}
@@ -235,6 +238,9 @@ package if you need a dns cache for your network.
 
 make %{?_smp_mflags}
 
+%check
+make %{?_smp_mflags} check || (cat test-suite.log && false)
+
 %install
 make install DESTDIR=%{buildroot}
 %{__mv} %{buildroot}%{_sysconfdir}/%{name}/recursor.conf-dist %{buildroot}%{_sysconfdir}/%{name}/recursor.conf
diff --git a/build-scripts/debian-authoritative/rules b/build-scripts/debian-authoritative/rules
index 84fae94c5..e308ace0f 100755
--- a/build-scripts/debian-authoritative/rules
+++ b/build-scripts/debian-authoritative/rules
@@ -93,7 +93,7 @@ override_dh_auto_build-arch:
 
 # Verbose tests (shows used compiler/linker and their flags)
 override_dh_auto_test:
-	$(MAKE) -C pdns check
+	$(MAKE) -C pdns check || (cat pdns/test-suite.log && false)
 	#dh_auto_test -- V=1
 
 # restore moved files
diff --git a/build-scripts/debian-dnsdist/rules b/build-scripts/debian-dnsdist/rules
index 752241004..49836e04b 100755
--- a/build-scripts/debian-dnsdist/rules
+++ b/build-scripts/debian-dnsdist/rules
@@ -64,3 +64,6 @@ override_dh_auto_build-arch:
 
 override_dh_strip:
 	dh_strip --dbg-package=dnsdist-dbg
+
+override_dh_auto_test:
+	$(MAKE) check || (cat test-suite.log && false)
diff --git a/build-scripts/debian-recursor/rules b/build-scripts/debian-recursor/rules
index f08ec0435..a411458e8 100755
--- a/build-scripts/debian-recursor/rules
+++ b/build-scripts/debian-recursor/rules
@@ -84,3 +84,6 @@ override_dh_strip:
 
 override_dh_installinit:
 	dh_installinit --error-handler=initscript_error -- defaults 19 85
+
+override_dh_auto_test:
+	$(MAKE) check || (cat test-suite.log && false)