[med-svn] [htslib] 01/02: Make sure no remainings of build time test will occur in test data package

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository htslib.

commit f696fc20fb9eb619f67b753b7a2b04799e6f274e
Author: Andreas Tille <tille at debian.org>
Date:   Thu Dec 14 14:58:02 2017 +0100

    Make sure no remainings of build time test will occur in test data package
---
 debian/changelog |  2 ++
 debian/rules     | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 662c637..207935b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ htslib (1.6-2) UNRELEASED; urgency=medium
     of bcftools but are not needed any more
   * Remove tabix dependency which was provided to enable build of a
     previous version of bcftools
+  * Make sure no remainings of build time test will occur in test data
+    package
 
  -- Andreas Tille <tille at debian.org>  Thu, 14 Dec 2017 14:03:38 +0100
 
diff --git a/debian/rules b/debian/rules
index e735b5f..f8086c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,12 +14,9 @@ endif
 %:
 	dh $@
 
-override_dh_auto_test:
-	dh_auto_test
-	$(RM) test/*.tmp test/*.tmp.* test/*.o test/*.dSYM \
-              test/fieldarith test/hfile test/test_view test/test-vcf-api test/test-vcf-sweep
-
 override_dh_auto_configure:
+	# create clean copy of test dir
+	cp -a test test_backup
 	autoconf
 	dh_auto_configure -- --enable-libcurl
 
@@ -40,6 +37,10 @@ override_dh_auto_install:
 	  prefix=/usr \
 	  libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	  PACKAGE_VERSION="$(DEB_VERSION)"
+	# restore clean copy of test dir before dh_install is run
+	# This should not be done earlier since dh_auto_install contains some unconditional removals
+	$(RM) -r test
+	mv test_backup test
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/htslib.git