From: Bdale Garbee <bdale@gag.com>
Date: Thu, 8 Jun 2017 18:30:15 +0000 (-0600)
Subject: Merge branch 'next' into dfsg-debian
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=4b15127328bfe8ace09039e75a4c1ddea5854db2;hp=33efdea58b0835e843138cf3080993980794d8f6;p=debian%2Ftar

Merge branch 'next' into dfsg-debian
---

diff --git a/debian/changelog b/debian/changelog
index 21c2f8c6..65fb236c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-tar (1.29b-2) UNRELEASED; urgency=medium
+tar (1.29b-2) unstable; urgency=medium
 
   * add suggests tar-doc, closes: #856958
+  * dump test results into build log on make check failure for kfreebsd team
 
- -- Bdale Garbee <bdale@gag.com>  Thu, 08 Jun 2017 12:27:13 -0600
+ -- Bdale Garbee <bdale@gag.com>  Thu, 08 Jun 2017 12:20:20 -0600
 
 tar (1.29b-1.1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 6ed8fe20..7c2f21c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 	  echo "Sorry, but the test suite is not designed to be run as root."; \
 	  exit 1 ;\
 	fi
-	$(MAKE) check
+	$(MAKE) check || { cat tests/testsuite.log; false; }
 endif
 endif