[jruby] 01/01: Fix broken tests in sbuild

[Miguel Landaeta]

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

nomadium pushed a commit to branch experimental
in repository jruby.

commit eebbdc5095a5f002f66a79fd90f08450f50a36be
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Mar 11 22:35:43 2017 +0000

    Fix broken tests in sbuild
---
 debian/changelog                                              |  1 +
 debian/control                                                |  1 +
 debian/patches/0010-Exclude-mri-tests-failing-in-debian.patch | 10 ++++++++++
 debian/rules                                                  |  2 ++
 4 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bf5299e..c710ccd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jruby (9.1.8.0-1~exp2) UNRELEASED; urgency=medium
   * Don't ignore failures from MRI tests suite.
     However, a few tests were excluded, so an additional patch was introduced:
     0010-Exclude-mri-tests-failing-in-debian.patch
+  * Reintroduce B-D on locales-all.
 
  -- Miguel Landaeta <nomadium at debian.org>  Sat, 11 Mar 2017 20:22:13 +0000
 
diff --git a/debian/control b/debian/control
index 0f60612..c8f5403 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,7 @@ Build-Depends: ant-optional,
                libunsafe-fences-java,
                libunsafe-mock-java,
                libyaml-snake-java,
+               locales-all,
                maven-debian-helper (>= 2.0~),
                nailgun,
                rake,
diff --git a/debian/patches/0010-Exclude-mri-tests-failing-in-debian.patch b/debian/patches/0010-Exclude-mri-tests-failing-in-debian.patch
index 908c7fc..107ddfb 100644
--- a/debian/patches/0010-Exclude-mri-tests-failing-in-debian.patch
+++ b/debian/patches/0010-Exclude-mri-tests-failing-in-debian.patch
@@ -64,3 +64,13 @@ Last-Update: 2017-03-11
 +exclude :test_ancestors, "needs investigation"
 +exclude :test_included_module, "needs investigation"
 +exclude :test_included_modules, "needs investigation"
+--- jruby-9.1.8.0/test/mri/excludes/TestFileExhaustive.rb
++++ jruby-9.1.8.0/test/mri/excludes/TestFileExhaustive.rb
+@@ -7,4 +7,5 @@ exclude :test_expand_path_returns_tainted_strings_or_not, "needs investigation"
+ exclude :test_extname, "needs investigation"
+ exclude :test_join_ascii_incompatible, "needs investigation"
+ exclude :test_lchmod, "Fails on Linux"
+-exclude :test_readlink_long_path, "needs investigation"
+\ No newline at end of file
++exclude :test_readlink_long_path, "needs investigation"
++exclude :test_expand_path_for_existent_username, "sbuild breaks this test since it modifies the environment"
diff --git a/debian/rules b/debian/rules
index df42b0f..e932736 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 include /usr/share/dpkg/default.mk
 
+export LC_ALL=en_US.UTF-8
+
 %:
 	dh $@ --buildsystem=maven
 

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