[med-svn] [picard-tools] 01/04: patch testng and disable unit tests, lower #880258 severity

[Olivier Sallou]

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

osallou pushed a commit to branch master
in repository picard-tools.

commit 32d8a1ce0b9812f043c35fdabc3619b4068467fe
Author: Olivier Sallou <osallou at debian.org>
Date:   Wed Nov 1 08:42:38 2017 +0000

    patch testng and disable unit tests, lower #880258 severity
---
 debian/changelog                         |  4 ++++
 debian/control                           |  3 +--
 debian/patches/40-tests-fix-testng.patch | 11 +++++++++++
 debian/patches/series                    |  1 +
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0bbbd5d..897e5d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 picard-tools (2.8.1+dfsg-3) UNRELEASED; urgency=medium
 
   * debian/upstream/metadata: RRID -> SciCrunch
+  [ Olivier Sallou ]
+  * d/patches/40-tests-fix-testng.patch: fix testng reference
+  * d/rules: disable unit tests due to gradle 3.2+testng issue
+    (will be fixed by gradle 3.4), lower #880258 severity
 
  -- Steffen Moeller <moeller at debian.org>  Sun, 22 Oct 2017 18:38:46 +0200
 
diff --git a/debian/control b/debian/control
index 455b179..36b4121 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,7 @@ Build-Depends: default-jdk (>= 2:1.8),
                maven-repo-helper,
                libguava-java (>= 15.0),
 # htsjdk and picard-tools are relased nearly together
-               libhtsjdk-java (>= 2.8~),
-               libhtsjdk-java (<< 2.9~),
+               libhtsjdk-java (>= 2.12~),
 # required for tests:
                testng (>= 6.9.10),
                r-base-core,
diff --git a/debian/patches/40-tests-fix-testng.patch b/debian/patches/40-tests-fix-testng.patch
new file mode 100644
index 0000000..5f214ac
--- /dev/null
+++ b/debian/patches/40-tests-fix-testng.patch
@@ -0,0 +1,11 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -32,7 +32,7 @@
+     compile 'com.github.samtools:htsjdk:' + htsjdkVersion
+     //tools dependency for doclet requires sdk devel
+     compile(files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs()))
+-    testCompile 'org.testng:testng:6.9.10'
++    testCompile 'org.testng:testng:debian'
+ }
+ 
+ sourceCompatibility = 1.8
diff --git a/debian/patches/series b/debian/patches/series
index 5267fe2..20ee22d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 10-build.xml.patch
 20-shadowjar.patch
 30-tests-fix-dataprovider.patch
+40-tests-fix-testng.patch

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