[med-svn] [bcftools] 03/10: Set up autopkgtest to run tests including plugin-tests

[Afif Elghraoui]

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

afif-guest pushed a commit to branch master
in repository bcftools.

commit 445f08831c1cd42ab61e199e09b60417906d7619
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Mon Nov 9 22:57:04 2015 -0800

    Set up autopkgtest to run tests including plugin-tests
    
    This works now that the plugins are properly installed.
---
 debian/patches/series                 |  1 +
 debian/patches/tests-pluginpath.patch | 21 +++++++++++++++++++++
 debian/tests/runtests                 |  7 -------
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index a7a617c..9031066 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ improve-plugin-support.patch
 external-libs.patch
 compiler-flags.patch
 destdir.patch
+tests-pluginpath.patch
diff --git a/debian/patches/tests-pluginpath.patch b/debian/patches/tests-pluginpath.patch
new file mode 100644
index 0000000..9b36d4a
--- /dev/null
+++ b/debian/patches/tests-pluginpath.patch
@@ -0,0 +1,21 @@
+Description: Set the bcftools plugin path to search system directories
+ The tests were intended to be run at build time only, so the test
+ script sets the plugins to be searched for /only/ in the build directory.
+ It does so by setting the environment variable BCFTOOLS_PLUGINS. However,
+ as described in the manpage bcftools(1), adding a colon to either side of
+ the path entry in the environment variable also searches the system
+ directories. We need this for autopkgtest to work.
+Author: Afif Elghraoui <afif at ghraoui.name>
+Forwarded: not-needed
+Last-Update: 2015-11-09
+--- bcftools.orig/test/test.pl
++++ bcftools/test/test.pl
+@@ -689,7 +689,7 @@
+ {
+     my ($opts,%args) = @_;
+     if ( !$$opts{test_plugins} ) { return; }
+-    $ENV{BCFTOOLS_PLUGINS} = "$$opts{bin}/plugins";
++    $ENV{BCFTOOLS_PLUGINS} = "$$opts{bin}/plugins:";
+     if ( !exists($args{args}) ) { $args{args} = ''; }
+     $args{args} =~ s/{PATH}/$$opts{path}/g;
+     bgzip_tabix_vcf($opts,"$args{in}");
diff --git a/debian/tests/runtests b/debian/tests/runtests
index 363c0af..e63da87 100755
--- a/debian/tests/runtests
+++ b/debian/tests/runtests
@@ -5,14 +5,7 @@ export HTSDIR=/usr/include
 BGZIP=/usr/bin/bgzip
 TABIX=/usr/bin/tabix
 
-all: test
-
 test: test/test-rbuf bcftools
-	./test/test.pl --exec bgzip=$(BGZIP) --exec tabix=$(TABIX)
-
-# This isn't currently set to run; The upstream build system apparently
-# doesn't install the included plugins
-test-plugins: test/test-rbuf bcftools
 	./test/test.pl --plugins --exec bgzip=$(BGZIP) --exec tabix=$(TABIX)
 
 bcftools:

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