[zookeeper] 13/15: Correct ivy profile during test phase on i386 (See: #860650)

[tony mancill]

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

tmancill pushed a commit to branch master
in repository zookeeper.

commit d3c2a28442a2c409f758261cb2538de4fea22473
Author: tony mancill <tmancill at debian.org>
Date:   Mon Jan 15 09:00:41 2018 -0800

    Correct ivy profile during test phase on i386 (See: #860650)
    
    This is related to Debian #860650. It doesn't resolve the FTBFS, as the
    tests still fail, but at least the test suite can be attempted now.
    
    Add build-deps on checkstyle, libapacheds-java,
    libcommons-collections3-java, and libcommons-io-java for test suite
    (currently only enabled for i386).
    
    Update debian/maven.rules for JARs used during test phase
---
 debian/control     | 4 ++++
 debian/maven.rules | 2 ++
 debian/rules       | 5 ++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 9ea25fe..60ff4f3 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
  ant-optional,
  autoconf,
  automake,
+ checkstyle,
  debhelper (>= 10~),
  default-jdk (>= 2:1.6),
  default-jdk-doc,
@@ -18,8 +19,11 @@ Build-Depends:
  javacc,
  javahelper (>= 0.28),
  junit4,
+ libapacheds-java,
  libboost-dev,
  libcppunit-dev,
+ libcommons-collections3-java,
+ libcommons-io-java,
  libjline-java,
  liblog4cxx-dev,
  liblog4j1.2-java (>> 1.2.15-8),
diff --git a/debian/maven.rules b/debian/maven.rules
index 97cd292..a02eef6 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1 +1,3 @@
 log4j log4j * s/.*/1.2.x/ * *
+junit junit * s/.*/4.x/ * *
+commons-collections commons-collections jar s/3\..*/3.x/ * *
diff --git a/debian/rules b/debian/rules
index 8f593b3..6f4a71f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,7 +88,10 @@ endif
 ifeq (i386, $(DEB_BUILD_ARCH))
 override_dh_auto_test-indep:
 	# Run core Java test suite against zookeeper
-	ant -Dversion=$(DEB_UPSTREAM_VERSION) -DlastRevision=-1 test-core-java
+	ant $(ANT_ARGS) \
+		-Divy.settings.file=/usr/share/ivy-debian-helper/ivysettings.xml \
+		-Divy.default.ivy.user.dir=$(CURDIR)/.ivy2 \
+		test-core-java
 endif
 endif
 

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