This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository jruby.
commit 719a009a621e4a7becba4c1ea5e41bc918614fad Author: Markus Koschany <[email protected]> Date: Thu Dec 29 15:44:54 2016 +0100 Fix 0007-Enable-test-suites.patch. bin/rake does not exist --- debian/changelog | 7 ++++++ debian/patches/0007-Enable-test-suites.patch | 37 ++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 45 insertions(+) diff --git a/debian/changelog b/debian/changelog index be8f465..c27f976 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +jruby (1.7.26-2) UNRELEASED; urgency=medium + + * Team upload. + * Fix 0007-Enable-test-suites.patch. bin/rake does not exist anymore. + + -- Markus Koschany <[email protected]> Thu, 29 Dec 2016 17:51:03 +0100 + jruby (1.7.26-1) unstable; urgency=medium * Team upload. diff --git a/debian/patches/0007-Enable-test-suites.patch b/debian/patches/0007-Enable-test-suites.patch new file mode 100644 index 0000000..683c1af --- /dev/null +++ b/debian/patches/0007-Enable-test-suites.patch @@ -0,0 +1,37 @@ +From: Markus Koschany <[email protected]> +Date: Thu, 29 Dec 2016 15:44:21 +0100 +Subject: 0007-Enable-test-suites + +--- + rakelib/rspec.rake | 5 +++-- + rakelib/test.rake | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/rakelib/rspec.rake b/rakelib/rspec.rake +index dfdf655d5..fddd1ca26 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 250133647..302e2ccae 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 + diff --git a/debian/patches/series b/debian/patches/series index 7db1783..908ce3e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +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-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
