[med-svn] [htsjdk] 02/02: Skip tests checking the use of the local zip implementation

[Vincent Danjean]

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

vdanjean pushed a commit to branch master
in repository htsjdk.

commit 1bdaae8f0e1787bf083b201ef423e2fcf33da6b8
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date:   Sat May 21 23:29:27 2016 +0200

    Skip tests checking the use of the local zip implementation
---
 debian/changelog                                             | 4 ++++
 debian/patches/{fix-tests.patch => 14-skip_local_zlib_tests} | 9 +++++++++
 debian/patches/series                                        | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9cc0878..ac2a399 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 htsjdk (2.3.0+dfsg.1-1) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * New upstream version
   * Take over change from debian/jessie-backports branch to successfully obtain JAVA_HOME
   * Bump Standards-Version to 3.9.8
 
+  [ Vincent Danjean ]
+  * Skip tests checking the use of the local zip implementation
+
  -- Andreas Tille <tille at debian.org>  Fri, 20 May 2016 11:37:24 +0200
 
 htsjdk (2.1.1+dfsg.1-1) unstable; urgency=medium
diff --git a/debian/patches/fix-tests.patch b/debian/patches/14-skip_local_zlib_tests
similarity index 64%
rename from debian/patches/fix-tests.patch
rename to debian/patches/14-skip_local_zlib_tests
index 6ea2965..e314bd6 100644
--- a/debian/patches/fix-tests.patch
+++ b/debian/patches/14-skip_local_zlib_tests
@@ -1,3 +1,12 @@
+Skip test for the use of the local zlib implementation
+
+The error in the tests seems to come from the (local) zip lib that is not used.
+The comments in src/java/htsjdk/samtools/util/zip/DeflaterFactory.java
+seems to show that
+- this is not a big issue (at most, it will be a little slower)
+- this is uneeded with JDK8 (and it seems we are using it now):
+  "Note that this class will no longer be necessary once Java 8 is
+  required, because[...]"
 --- a/src/tests/java/htsjdk/samtools/util/IntelDeflaterTest.java
 +++ b/src/tests/java/htsjdk/samtools/util/IntelDeflaterTest.java
 @@ -86,9 +86,13 @@
diff --git a/debian/patches/series b/debian/patches/series
index 28bc251..ac4be96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
-fix-tests.patch
 10-build.xml
 11-snappy-java-compatibility.patch
 12-use_libjbzip2-java
 13-skip_network_tests
+14-skip_local_zlib_tests

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