This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository jruby.
commit 8272b7ba84e2d5f15890db04b53fc2f871591642 Author: Markus Koschany <[email protected]> Date: Thu Dec 29 15:42:12 2016 +0100 Drop 0007-Enable-test-suites.patch --- debian/patches/0007-Enable-test-suites.patch | 52 ---------------------------- debian/patches/series | 1 - 2 files changed, 53 deletions(-) diff --git a/debian/patches/0007-Enable-test-suites.patch b/debian/patches/0007-Enable-test-suites.patch deleted file mode 100644 index 874960c..0000000 --- a/debian/patches/0007-Enable-test-suites.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: Miguel Landaeta <[email protected]> -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 -index dfdf655..fddd1ca 100644 ---- a/rakelib/rspec.rake -+++ b/rakelib/rspec.rake -@@ -15,8 +15,9 @@ - - namespace :spec do - # Put Rake on the load path for JI specs without requiring rubygems -- rake_location = File.join(Gem.loaded_specs['rake'].full_gem_path, "lib") -- gem 'rspec' -+ #rake_location = File.join(Gem.loaded_specs['rake'].full_gem_path, "lib") -+ #gem 'rspec' -+ rake_location = './lib/ruby/1.9/rake.rb' - require 'rspec/core/rake_task' - - compile_flags = { -diff --git a/rakelib/test.rake b/rakelib/test.rake -index 2501336..302e2cc 100644 ---- a/rakelib/test.rake -+++ b/rakelib/test.rake -@@ -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' - t.ruby_opts << '-r minitest/excludes' - end - ---- a/bin/rake -+++ b/bin/rake -@@ -19,5 +19,14 @@ - end - end - --gem 'rake', version --load Gem.bin_path('rake', 'rake', version) -+begin -+ gem 'rake', version -+ load Gem.bin_path('rake', 'rake', version) -+rescue NameError => e # --disable-gems -+ raise unless e.name == :gem -+rescue Gem::LoadError, LoadError -+end -+ -+require 'rake' -+ -+Rake.application.run diff --git a/debian/patches/series b/debian/patches/series index 908ce3e..7db1783 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,6 @@ 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-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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
