Louis-Philippe Véronneau pushed to branch master at Debian Java Maintainers / jruby
Commits: a539f5d2 by Louis-Philippe Véronneau at 2021-01-06T17:00:57-05:00 fix more testsuite errors - - - - - 5607a6d9 by Louis-Philippe Véronneau at 2021-01-06T17:23:54-05:00 d/patches: remove LOAD_PATH hacks from 0008. This is not needed anymore, since we're symlinking lib/ruby/gems/shared (in the upstream LOAD_PATH for tests) to lib/ruby/stdlib, where we're copying gems. - - - - - 734ca482 by Louis-Philippe Véronneau at 2021-01-06T17:59:24-05:00 d/test-tasks.txt: mri:fullint has been renamed to mri:core:fullint - - - - - 4 changed files: - debian/control - debian/patches/0008-Configure-unit-tests-to-run-at-build-time.patch - debian/rules - debian/test-tasks.txt Changes: ===================================== debian/control ===================================== @@ -54,8 +54,11 @@ Build-Depends: rake, ruby-jar-dependencies, ruby-rspec, + ruby-psych (>= 3.1.0+really3.1.0-1), + ruby-json (>= 2.3.0+dfsg-1), ruby-test-unit, ruby-rake-ant, + ruby-cmath, Standards-Version: 4.3.0 Homepage: http://jruby.org/ Vcs-Git: https://salsa.debian.org/java-team/jruby.git ===================================== debian/patches/0008-Configure-unit-tests-to-run-at-build-time.patch ===================================== @@ -25,7 +25,7 @@ Index: jruby/bin/rake =================================================================== --- jruby.orig/bin/rake +++ jruby/bin/rake -@@ -6,22 +6,28 @@ +@@ -6,22 +6,26 @@ # this file is here to facilitate running it. # @@ -51,7 +51,7 @@ Index: jruby/bin/rake +# end -version = ">= 0.a" -+$LOAD_PATH << 'lib/ruby/stdlib' ++require 'rake' -if ARGV.first - str = ARGV.first @@ -61,8 +61,7 @@ Index: jruby/bin/rake - ARGV.shift - end -end -+require 'rake' - +- -if Gem.respond_to?(:activate_bin_path) -load Gem.activate_bin_path('rake', 'rake', version) -else @@ -70,15 +69,3 @@ Index: jruby/bin/rake -load Gem.bin_path("rake", "rake", version) -end +Rake.application.run -Index: jruby/rakelib/test.rake -=================================================================== ---- jruby.orig/rakelib/test.rake -+++ jruby/rakelib/test.rake -@@ -123,6 +123,7 @@ namespace :test do - t.verbose = true - t.ruby_opts << '-Xaot.loadClasses=true' # disabled by default now - t.ruby_opts << '-I.' -+ t.ruby_opts << '-Ilib/ruby/stdlib' - t.ruby_opts << '-J-ea' - t.ruby_opts << '--headless' - classpath = %w[test test/target/test-classes core/target/test-classes].join(File::PATH_SEPARATOR) ===================================== debian/rules ===================================== @@ -24,6 +24,7 @@ override_dh_auto_clean: -find . -name pom.xml.save -delete -rm -r ./tmp/ -cd ./spec/ffi/fixtures/ && rm -f *.o *.so + rm -rf ./lib/ruby/gems mh_clean override_dh_auto_configure: @@ -67,22 +68,29 @@ prepare-tests: ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) # this just copies some needed gems and their dependencies to the # lib directory, so tests can load all their needed dependencies - cd ./lib/ruby/stdlib/ && for gem in psych json fileutils; do \ + cd ./lib/ruby/stdlib/ && for gem in csv fileutils; do \ cp -a /usr/lib/ruby/2.7.0/$$gem* ./ ; \ done + cd ./lib/ruby/stdlib/ && for gem in psych json jar; do \ + cp -a /usr/lib/ruby/vendor_ruby/$$gem* ./ ; \ + done cd ./lib/ruby/stdlib/ && cp -a \ /usr/share/rubygems-integration/all/gems/test-unit-*/lib/test* \ - /usr/share/rubygems-integration/all/gems/rake-*/lib/rake* \ - /usr/share/rubygems-integration/all/gems/rake-ant*/lib/ant.rb \ - /usr/share/rubygems-integration/all/gems/rspec-*/lib/rspec* \ + /usr/share/rubygems-integration/all/gems/rake-*/lib/rake* \ + /usr/share/rubygems-integration/all/gems/rake-ant*/lib/ant.rb \ + /usr/share/rubygems-integration/all/gems/rspec-*/lib/rspec* \ + /usr/share/rubygems-integration/all/gems/cmath-*/lib/cmath.rb \ + /usr/lib/ruby/2.7.0/webrick* \ + /usr/lib/ruby/2.7.0/ipaddr.rb \ ./ - cd ./lib/ruby/stdlib/ && cp -a /usr/lib/ruby/vendor_ruby/jar* ./ cd ./lib/ruby/stdlib/ && \ cp -aL /usr/share/jruby/lib/ruby/stdlib/*openssl* ./ \ && for lib in bouncycastle/bcpkix/debian bouncycastle/bcprov/debian yaml/snakeyaml/1.x; do \ mkdir -p ./org/$$lib ; \ cp $(MAVEN_REPO)/org/$$lib/$$(echo $$lib | cut -f2-3 -d/ --output-delimiter=-).jar ./org/$$lib ; \ done + mkdir lib/ruby/gems + ln -s lib/ruby/stdlib lib/ruby/gems/shared endif ===================================== debian/test-tasks.txt ===================================== @@ -4,7 +4,7 @@ test:jruby:fullint test:jruby:jit test:jruby:aot test:mri -test:mri:fullint +test:mri:core:fullint test:slow_suites test:tracing spec:ji View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/9b2458875dbf12cd282d80b7aa360d9a8ca5cc1e...734ca482377eb6789483a7ce62601848496f3799 -- View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/9b2458875dbf12cd282d80b7aa360d9a8ca5cc1e...734ca482377eb6789483a7ce62601848496f3799 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
