[jruby] 01/01: Do not ignore failures from MRI tests suite

Miguel Landaeta nomadium at moszumanska.debian.org
Sat Mar 11 20:31:06 UTC 2017


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

nomadium pushed a commit to branch experimental
in repository jruby.

commit e08cf205987e40a3e9cff3f2740305bd5becbed1
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Mar 11 20:31:57 2017 +0000

    Do not ignore failures from MRI tests suite
---
 debian/changelog                                   |  8 +++
 .../0010-Exclude-mri-tests-failing-in-debian.patch | 66 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  7 ++-
 4 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0411fe..bf5299e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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
+
+ -- Miguel Landaeta <nomadium at debian.org>  Sat, 11 Mar 2017 20:22:13 +0000
+
 jruby (9.1.8.0-1~exp1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/0010-Exclude-mri-tests-failing-in-debian.patch b/debian/patches/0010-Exclude-mri-tests-failing-in-debian.patch
new file mode 100644
index 0000000..908c7fc
--- /dev/null
+++ b/debian/patches/0010-Exclude-mri-tests-failing-in-debian.patch
@@ -0,0 +1,66 @@
+Description: Exclude MRI tests that are consistently failing
+ Upstream runs most of their tests in openjdk-7, but the default
+ JDK in Debian currently is openjdk-8, so this difference could
+ cause some failures. In any case, investigation is needed.
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2017-03-11
+
+--- /dev/null
++++ jruby-9.1.8.0/test/mri/excludes/TestCoverage.rb
+@@ -0,0 +1,3 @@
++exclude :test_coverage_snapshot, "needs investigation"
++exclude :test_peek_result_without_start, "needs investigation"
++exclude :test_restarting_coverage, "needs investigation"
+--- jruby-9.1.8.0.orig/test/mri/excludes/TestEval.rb
++++ jruby-9.1.8.0/test/mri/excludes/TestEval.rb
+@@ -1,3 +1,4 @@
+ exclude :test_eval_ascii_incompatible, "needs investigation"
+ exclude :test_eval_location_fstring, "needs investigation"
+ exclude :test_file_encoding, "needs investigation"
++exclude :test_eval_with_toplevel_binding, "needs investigation"
+--- /dev/null
++++ jruby-9.1.8.0/test/mri/excludes/TestJSONFixtures.rb
+@@ -0,0 +1 @@
++exclude :test_failing, "needs investigation"
+--- jruby-9.1.8.0.orig/test/mri/excludes/TestJSONGenerate.rb
++++ jruby-9.1.8.0/test/mri/excludes/TestJSONGenerate.rb
+@@ -3,3 +3,10 @@ exclude :test_gc, "needs investigation"
+ exclude :test_hash_likeness_set_string, "needs investigation"
+ exclude :test_hash_likeness_set_symbol, "needs investigation"
+ exclude :test_string_subclass, "hard call of json blows up; probably fixed in C ext. https://github.com/flori/json/issues/272"
++exclude :test_fast_generate, "needs investigation"
++exclude :test_fast_state, "needs investigation"
++exclude :test_generate, "needs investigation"
++exclude :test_generate_pretty, "needs investigation"
++exclude :test_own_state, "needs investigation"
++exclude :test_pretty_state, "needs investigation"
++exclude :test_safe_state, "needs investigation"
+--- jruby-9.1.8.0.orig/test/mri/excludes/TestMethod.rb
++++ jruby-9.1.8.0/test/mri/excludes/TestMethod.rb
+@@ -14,3 +14,4 @@ exclude :test_splat_long_array, "passes
+ exclude :test_super_method_removed, "finds super method when super method has been undef (#2155)"
+ exclude :test_to_proc_binding, "NullPointerException in parser"
+ exclude :test_visibility, "fails in compiler"
++exclude :test_callee_top_level, "needs investigation"
+--- jruby-9.1.8.0/test/mri/excludes/TestProcess.rb
++++ jruby-9.1.8.0/test/mri/excludes/TestProcess.rb
+@@ -67,3 +67,4 @@ exclude :test_system_wordsplit, "needs investigation"
+ exclude :test_uid_re_exchangeable_p, "unimplemented"
+ exclude :test_uid_sid_available?, "unimplemented"
+ exclude :test_wait_exception, "Interrupt expected but nothing was raised."
++exclude :test_popen_exit, "needs investigation, it gets killed"
+--- jruby-9.1.8.0/test/mri/excludes/TestDefined.rb
++++ jruby-9.1.8.0/test/mri/excludes/TestDefined.rb
+@@ -1 +1,2 @@
+ exclude :test_defined, "needs investigation"
++exclude :test_defined_impl_specific, "flaky, needs investigation"
+--- jruby-9.1.8.0/test/mri/excludes/TestModule.rb
++++ jruby-9.1.8.0/test/mri/excludes/TestModule.rb
+@@ -14,3 +14,6 @@ exclude :test_private_constant_with_no_args, "needs investigation"
+ exclude :test_protected_singleton_method, "needs investigation"
+ exclude :test_undef, "needs investigation"
+ exclude :test_prepend_each_classes, "needs investigation - ancestors do not match"
++exclude :test_ancestors, "needs investigation"
++exclude :test_included_module, "needs investigation"
++exclude :test_included_modules, "needs investigation"
diff --git a/debian/patches/series b/debian/patches/series
index f8f2175..a6a1531 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0007-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch
 0008-Configure-unit-tests-to-run-at-build-time.patch
 0009-Bundle-psych-java-extension.patch
+0010-Exclude-mri-tests-failing-in-debian.patch
diff --git a/debian/rules b/debian/rules
index f19db89..df42b0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,11 +67,14 @@ override_dh_auto_install:
 	mh_installjar -pjruby ./maven/jruby/pom.xml \
 		./maven/jruby/target/jruby-$(DEB_VERSION_UPSTREAM).jar
 
+export CI:="true"
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	cp -a /usr/lib/ruby/2.3.0/psych* ./lib/ruby/stdlib/
 	# to-do: package psych java extension
-	-dh_auto_build -- package -B -Dinvoker.skip=false -Prake -Dtask=test:mri
+	cp -a /usr/lib/ruby/2.3.0/psych* ./lib/ruby/stdlib/
+	cp -a ./tmp/java/psych/psych.jar ./lib/ruby/stdlib/
+	sed 's/1\.[0-9]\{1,2\}/1.x/' -i ./lib/ruby/stdlib/psych/versions.rb
+	dh_auto_build -- package -B -Dinvoker.skip=false -Prake -Dtask=test:mri
 	# these tests will be enabled once the following gems are packaged:
         # jar-dependencies and recent jruby-openssl (>= 0.9.17)
 #	-dh_auto_build -- package -B -Dinvoker.skip=false -Prake -Dtask=test:jruby

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



More information about the pkg-java-commits mailing list