[jruby] 02/06: Enable test suite spec:ruby:fast

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository jruby.

commit 353d1c2dc74e44ac6608ca7bed690e8da6f7acdb
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Nov 12 20:04:50 2016 +0000

    Enable test suite spec:ruby:fast
---
 debian/changelog                                           |  5 ++++-
 debian/control                                             |  6 +++++-
 ...ri19-test-suite.patch => 0007-Enable-test-suites.patch} | 14 ++++++--------
 debian/patches/series                                      |  2 +-
 debian/rules                                               |  4 ++--
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6429e93..4ff71f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,12 +11,15 @@ jruby (1.7.25-1) UNRELEASED; urgency=medium
   * Use https URLs with Vcs-* fields.
   * Refresh patches:
     - Add new patch:
+      + d/patches/0007-Enable-test-suites.patch.
       + d/patches/0012-Disable-outdated-specs.patch.
+  * Run more unit tests during build time.
+    The suit test spec:ruby:fast is ran from now on.
 
   [ Emmanuel Bourg ]
   * Depend on libasm-java (>= 5.0) instead of libasm4-java.
 
- -- Miguel Landaeta <nomadium at debian.org>  Sat, 12 Nov 2016 19:05:29 +0000
+ -- Miguel Landaeta <nomadium at debian.org>  Sat, 12 Nov 2016 19:35:58 +0000
 
 jruby (1.7.22-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index f3b7226..26098b4 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,9 @@ Build-Depends: ant-optional,
                maven-repo-helper,
                nailgun (>= 0.9.1~),
                netbase,
+               ruby-json,
                ruby-minitest,
+               ruby-minitest-excludes,
                ruby-rspec,
                yydebug
 Standards-Version: 3.9.8
@@ -87,7 +89,9 @@ Depends: default-jre | java6-runtime,
          nailgun (>= 0.9.1~),
          libyecht-java (>= 1.0~),
          ${misc:Depends}
-Recommends: ri, jruby-openssl
+Recommends: jruby-openssl,
+            ri,
+            ruby-json
 Provides: ruby-interpreter
 Description: 100% pure-Java implementation of Ruby
  JRuby is a high performance, stable, fully threaded Java implementation
diff --git a/debian/patches/0007-Enable-mri19-test-suite.patch b/debian/patches/0007-Enable-test-suites.patch
similarity index 77%
rename from debian/patches/0007-Enable-mri19-test-suite.patch
rename to debian/patches/0007-Enable-test-suites.patch
index 9764ec4..874960c 100644
--- a/debian/patches/0007-Enable-mri19-test-suite.patch
+++ b/debian/patches/0007-Enable-test-suites.patch
@@ -1,6 +1,6 @@
 From: Miguel Landaeta <nomadium at debian.org>
-Date: Thu, 28 May 2015 21:14:25 -0300
-Subject: Disable rake and rspec load through gems
+Date: Sat, 12 Nov 2016 19:41:24 +0000
+Subject: Adjust rake to run jruby unit tests in Debian
 Forwarded: no
 
 diff --git a/rakelib/rspec.rake b/rakelib/rspec.rake
@@ -20,19 +20,17 @@ index dfdf655..fddd1ca 100644
  
    compile_flags = {
 diff --git a/rakelib/test.rake b/rakelib/test.rake
-index 6765a3b..9890c6a 100644
+index 2501336..302e2cc 100644
 --- a/rakelib/test.rake
 +++ b/rakelib/test.rake
-@@ -113,7 +113,8 @@ namespace :test do
+@@ -114,6 +114,7 @@ namespace :test do
      t.ruby_opts << '-I test/externals/ruby1.9'
      t.ruby_opts << '-I test/externals/ruby1.9/ruby'
      t.ruby_opts << '-r ./test/ruby19_env.rb'
--    t.ruby_opts << '-r minitest/excludes'
-+    # minitest-excludes gem must be packaged first!
-+    #t.ruby_opts << '-r minitest/excludes'
++    t.ruby_opts << '-r minitest'
+     t.ruby_opts << '-r minitest/excludes'
    end
    
-   permute_tests(:mri, compile_flags) do |t|
 --- a/bin/rake
 +++ b/bin/rake
 @@ -19,5 +19,14 @@
diff --git a/debian/patches/series b/debian/patches/series
index b493325..908ce3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@
 0003-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch
 0004-Use-debian-versions-for-plugins-in-pom-test.patch
 0006-Allow-rdoc-to-run-without-gems.patch
-#0007-Enable-mri19-test-suite.patch
+0007-Enable-test-suites.patch
 0008-Disable-some-failing-user-tests-in-pbuilder.patch
 0009-Disable-bigdecimal-divmod-spec-failing-test.patch
 0010-Disable-maven-invoker-plugin.patch
diff --git a/debian/rules b/debian/rules
index 6b2a75a..8b09402 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,8 +65,8 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 
 	dh_auto_test -- -Ptest test
 	./bin/jruby spec/mspec/bin/mspec ci
-	# enable it when minitest-excludes is available in the archive
-	#./bin/jruby -S ./bin/rake test:mri19
+	./bin/jruby -S ./bin/rake spec:ruby:fast
+	# many tests are broken in test:extended, help is needed to debug them
 	#./bin/jruby -S ./bin/rake test:extended
 
 	# remove links to jruby-openssl library

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