[tomcat8] 10/13: Enabled the APR tests

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch experimental
in repository tomcat8.

commit c78cfa78e4fd24c67cc2d21d1a24d949303c68ce
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 17 16:07:33 2016 +0100

    Enabled the APR tests
---
 debian/changelog                                        |  1 +
 debian/control                                          |  1 +
 debian/patches/0021-dont-test-unsupported-ciphers.patch | 13 +++++++++++++
 debian/patches/series                                   |  1 +
 debian/rules                                            |  2 +-
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index faf3881..9de781f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ tomcat8 (8.5.8-1) UNRELEASED; urgency=medium
     - Updated the policy files
   * Enabled the APR library loading by default (required for HTTP/2 support)
   * Promoted libtcnative-1 from suggested to recommended dependency
+  * Enabled the APR tests
   * Fixed the test failure with TestStandardContextAliases
   * Adapted debian/orig-tar.sh to download the 8.5.x releases
 
diff --git a/debian/control b/debian/control
index f813b4c..4a13778 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends-Indep: javahelper,
                      libhamcrest-java (>= 1.3),
                      libtaglibs-standard-spec-java,
                      libtaglibs-standard-impl-java,
+                     libtcnative-1,
                      libobjenesis-java,
                      lsb-release,
                      maven-repo-helper
diff --git a/debian/patches/0021-dont-test-unsupported-ciphers.patch b/debian/patches/0021-dont-test-unsupported-ciphers.patch
new file mode 100644
index 0000000..b957b42
--- /dev/null
+++ b/debian/patches/0021-dont-test-unsupported-ciphers.patch
@@ -0,0 +1,13 @@
+Description: Don't check the IDEA cipher during the tests since it is disabled in Debian (see #327739)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
++++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+@@ -100,6 +100,7 @@
+         unimplemented.add(Cipher.SSL2_RC4_128_EXPORT40_WITH_MD5);
+         unimplemented.add(Cipher.SSL2_IDEA_128_CBC_WITH_MD5);
+         unimplemented.add(Cipher.SSL2_DES_192_EDE3_CBC_WITH_MD5);
++        unimplemented.add(Cipher.TLS_RSA_WITH_IDEA_CBC_SHA);
+ 
+         if (VERSION < 10002) {
+             // These were implemented in 1.0.2 so won't be available in any
diff --git a/debian/patches/series b/debian/patches/series
index 08d91e7..1b36989 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0013-dont-look-for-build-properties-in-user-home.patch
 0018-fix-manager-webapp.patch
 0019-add-distribution-to-error-page.patch
+0021-dont-test-unsupported-ciphers.patch
diff --git a/debian/rules b/debian/rules
index fa67218..4679849 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	mkdir -p webapps/examples/WEB-INF/lib
 	cp /usr/share/java/taglibs-standard-spec.jar webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar
 	cp /usr/share/java/taglibs-standard-impl.jar webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar
-	$(ANT) test
+	$(ANT) test -Dtest.apr.loc=/usr/lib/$(shell dpkg-architecture --query DEB_BUILD_MULTIARCH)
 endif
 
 override_dh_install-indep:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git