[Git][java-team/jruby][master] 5 commits: d/tests: add JOBS=2 envvar
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Fri Dec 9 22:03:53 GMT 2022
Jérôme Charaoui pushed to branch master at Debian Java Maintainers / jruby
Commits:
0045b9bb by Jérôme Charaoui at 2022-12-09T15:19:03-05:00
d/tests: add JOBS=2 envvar
By default the test runner spawns nproc-1 processes, which can be a lot
(33 on a amd64 debci system), and suspect this may result in
deadlocks/timeouts seens in debci, that I cannot reproduce locally.
- - - - -
de974bed by Jérôme Charaoui at 2022-12-09T16:28:04-05:00
d/tests: get rid of needs-sudo
By simply adding system Ruby paths to GEM_PATH we can avoid the need to
copy gems into the /usr/share/jruby/lib/ruby/gems/shared directory in
order to make rake, rspec and friends available in JRuby.
For jgem we specify a writable paths for jruby.gem.home property and
jruby.binpath properties.
- - - - -
4ddfa02c by Jérôme Charaoui at 2022-12-09T16:28:42-05:00
d/tests: exclude failing testcase in mri-stdlib
This test is consistently failing for unknown reasons, so exclude it
here until we figure out whats going on.
- - - - -
456069f2 by Jérôme Charaoui at 2022-12-09T16:28:56-05:00
d/control: add Breaks+Replaces on jruby-openssl (Closes: #1025442)
A Provides is not necessary since no other packages depend on this
jruby-specific library.
- - - - -
71618700 by Jérôme Charaoui at 2022-12-09T16:54:38-05:00
Update changelog for 9.3.9.0+ds-2 release
- - - - -
14 changed files:
- debian/changelog
- debian/control
- debian/tests/common.sh
- debian/tests/control
- debian/tests/jgem
- debian/tests/jruby
- debian/tests/mri-core
- debian/tests/mri-extra
- debian/tests/mri-stdlib
- debian/tests/spec-compiler
- debian/tests/spec-ffi
- debian/tests/spec-ji
- debian/tests/spec-jruby
- debian/tests/spec-ruby
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+jruby (9.3.9.0+ds-2) unstable; urgency=medium
+
+ * d/control: add Breaks+Replaces on jruby-openssl (Closes: #1025442)
+ * d/tests:
+ * add JOBS=2 and CI=1 to test environment
+ + fix failing tests caused by missing class
+ + fix mri-stdlib test failure due to TMPDIR
+ - get rid of needs-sudo
+ - exclude failing testcase in mri-stdlib
+
+ -- Jérôme Charaoui <jerome at riseup.net> Fri, 09 Dec 2022 16:29:20 -0500
+
jruby (9.3.9.0+ds-1) unstable; urgency=medium
* New upstream release incorporating security fixes for CVE-2021-31810
=====================================
debian/control
=====================================
@@ -72,6 +72,8 @@ Depends:
${maven:Depends},
Recommends:
fonts-lato,
+Breaks: jruby-openssl
+Replaces: jruby-openssl
Description: 100% pure-Java implementation of Ruby
JRuby is an implementation of the ruby language using the JVM.
.
=====================================
debian/tests/common.sh
=====================================
@@ -3,31 +3,12 @@ set -e
# prepare test environment
prepare() {
cp -a default.build.properties Gemfile Rakefile rakelib spec test "$AUTOPKGTEST_TMP"
- ln -s /usr/share/jruby/bin "$AUTOPKGTEST_TMP/bin"
+ cp -a /usr/share/jruby/bin "$AUTOPKGTEST_TMP/bin"
ln -s /usr/share/jruby/lib "$AUTOPKGTEST_TMP/lib"
export LANG=C.UTF-8
export LC_ALL=C.UTF-8
export CI=1
-}
-
-# install rspec for jruby
-# requires the ruby-spec debian package
-install_rspec() {
- sudo mkdir -p /usr/share/jruby/lib/ruby/gems/shared/gems
- sudo mkdir -p /usr/share/jruby/lib/ruby/gems/shared/specifications
- for gem in diff-lcs minitest power_assert rake rspec rspec-core rspec-expectations rspec-mocks rspec-support test-unit; do
- # some gems are copied from libruby*, others from local rubygems
- if test -e /usr/lib/ruby/gems/*/gems/${gem}-*; then
- gembase="/usr/lib/ruby/gems/*"
- else
- gembase=/usr/share/rubygems-integration/all
- fi
- echo "installing ${gem} gem into jruby ..."
- sudo cp -a ${gembase}/gems/${gem}-* /usr/share/jruby/lib/ruby/gems/shared/gems
- sudo cp -a ${gembase}/specifications/${gem}-* /usr/share/jruby/lib/ruby/gems/shared/specifications
- done
- mkdir -p ./bin
- # installing bin/rake for jruby
- sudo cp /usr/bin/rake ./bin/rake
- sed -i '1s|^#!.*|#!/usr/bin/jruby|' ./bin/rake
+ export JOBS=2
+ # make test dependencies (bundle gems) in system gems available to jruby
+ export GEM_PATH=/usr/share/jruby/lib/ruby/shared:/usr/share/rubygems-integration/all:/usr/lib/ruby/gems/3.1.0
}
=====================================
debian/tests/control
=====================================
@@ -2,7 +2,7 @@ Tests: smoke
Restrictions: superficial
Tests: jgem
-Restrictions: needs-sudo, needs-internet
+Restrictions: allow-stderr, needs-internet
Tests: jirb
Depends:
@@ -23,7 +23,7 @@ Depends:
ruby-rspec,
ruby-test-unit,
@,
-Restrictions: needs-sudo, allow-stderr
+Restrictions: allow-stderr
Tests: spec-compiler
Depends:
@@ -35,7 +35,7 @@ Depends:
ruby-rspec,
ruby-test-unit,
@,
-Restrictions: needs-sudo, allow-stderr
+Restrictions: allow-stderr
Tests: spec-ffi
Depends:
@@ -48,7 +48,7 @@ Depends:
ruby-rspec,
ruby-test-unit,
@,
-Restrictions: needs-sudo, allow-stderr
+Restrictions: allow-stderr
Tests: spec-ji
Depends:
@@ -65,7 +65,7 @@ Depends:
ruby-test-unit,
zip,
@,
-Restrictions: needs-sudo, allow-stderr
+Restrictions: allow-stderr
Tests: spec-jruby
Depends:
@@ -77,7 +77,7 @@ Depends:
ruby-rspec,
ruby-test-unit,
@,
-Restrictions: needs-sudo, allow-stderr
+Restrictions: allow-stderr
Tests: spec-ruby
Depends:
@@ -89,7 +89,7 @@ Depends:
ruby-rspec,
ruby-test-unit,
@,
-Restrictions: needs-sudo, allow-stderr
+Restrictions: allow-stderr
Tests: mri-core
Depends:
@@ -101,7 +101,7 @@ Depends:
ruby-rspec,
ruby-test-unit,
@,
-Restrictions: needs-sudo, allow-stderr
+Restrictions: allow-stderr
Tests: mri-extra
Depends:
@@ -113,7 +113,7 @@ Depends:
ruby-rspec,
ruby-test-unit,
@,
-Restrictions: needs-sudo, allow-stderr
+Restrictions: allow-stderr
Tests: mri-stdlib
Depends:
@@ -125,4 +125,4 @@ Depends:
ruby-rspec,
ruby-test-unit,
@,
-Restrictions: needs-sudo, allow-stderr
+Restrictions: allow-stderr
=====================================
debian/tests/jgem
=====================================
@@ -8,6 +8,13 @@ set -e
# (specific gem not important)
jgem list | grep '^json'
+# prepare a writable GEM_HOME
+mkdir -p /tmp/jruby/gems /tmp/jruby/bin
+export JRUBY_OPTS="-J-Djruby.gem.home=/tmp/jruby/gems -J-Djruby.bindir=/tmp/jruby/bin"
+
# check if we can install a new gem
-sudo jgem install rake
+jgem install rake
jgem list | grep -q "^rake ([0-9\.]\+)"
+
+# invoke the new gem's binary
+jruby -S rake --version
=====================================
debian/tests/jruby
=====================================
@@ -3,15 +3,14 @@
. "$(dirname $0)/common.sh"
prepare
-install_rspec
cd "$AUTOPKGTEST_TMP"
# extra java libs required
mkdir test/target
-sudo ln -s /usr/share/java/junit4.jar test/target/junit.jar
-sudo ln -s /usr/share/java/jakarta-annotation-api.jar test/target/annotation-api.jar
-sudo ln -s /usr/share/java/jarjar.jar test/target/jarjar.jar
+ln -s /usr/share/java/junit4.jar test/target/junit.jar
+ln -s /usr/share/java/jakarta-annotation-api.jar test/target/annotation-api.jar
+ln -s /usr/share/java/jarjar.jar test/target/jarjar.jar
# compile a few test dependencies
gcc test/jruby/testapp/testapp.c -o test/jruby/testapp/testapp
@@ -23,7 +22,7 @@ javac -cp lib/jruby.jar:test/target/junit.jar:test/target/annotation-api.jar -d
# some test cases look for these specific files
cp "$OLDPWD/pom.xml" .
-sudo cp -a bin/jruby bin/jruby.sh
+cp bin/jruby bin/jruby.sh
# when $TMPDIR is /tmp and $PWD is under there
# it causes the test_jrubyc.rb/test_target test case to fail
=====================================
debian/tests/mri-core
=====================================
@@ -3,7 +3,6 @@
. "$(dirname $0)/common.sh"
prepare
-install_rspec
cd "$AUTOPKGTEST_TMP"
=====================================
debian/tests/mri-extra
=====================================
@@ -3,7 +3,6 @@
. "$(dirname $0)/common.sh"
prepare
-install_rspec
cd "$AUTOPKGTEST_TMP"
=====================================
debian/tests/mri-stdlib
=====================================
@@ -3,13 +3,17 @@
. "$(dirname $0)/common.sh"
prepare
-install_rspec
cd "$AUTOPKGTEST_TMP"
-# exclude failing test
+# exclude failing tests
+
# Error:EOPNOTSUPP likely caused by autopkgtest environment
echo 'exclude :test_cp_r_symlink_preserve, "fails in autopkgtests"' >> test/mri/excludes/TestFileUtils.rb
+# Unknown cause, fails systematically to raise TypeError
+mkdir test/mri/excludes/TestDigest
+echo 'exclude :test_initialize_copy_md5_rmd160, "fails in autopkgtests"' >> test/mri/excludes/TestDigest/TestInitCopy.rb
+
# run the rspec testsuite
-jruby -S rake test:mri:stdlib
+jruby -J-Djruby.gem.home=/usr/share/rubygems-integration/all -S rake test:mri:stdlib
=====================================
debian/tests/spec-compiler
=====================================
@@ -3,7 +3,6 @@
. "$(dirname $0)/common.sh"
prepare
-install_rspec
# run the rspec testsuite
cd "$AUTOPKGTEST_TMP"
=====================================
debian/tests/spec-ffi
=====================================
@@ -3,7 +3,6 @@
. "$(dirname $0)/common.sh"
prepare
-install_rspec
# run the rspec testsuite
cd "$AUTOPKGTEST_TMP"
=====================================
debian/tests/spec-ji
=====================================
@@ -3,14 +3,13 @@
. "$(dirname $0)/common.sh"
prepare
-install_rspec
# extra java libs required
cd "$AUTOPKGTEST_TMP"
mkdir test/target
-sudo ln -s /usr/share/java/junit4.jar test/target/junit.jar
-sudo ln -s /usr/share/java/jakarta-annotation-api.jar test/target/annotation-api.jar
-sudo ln -s /usr/share/java/jarjar.jar test/target/jarjar.jar
+ln -s /usr/share/java/junit4.jar test/target/junit.jar
+ln -s /usr/share/java/jakarta-annotation-api.jar test/target/annotation-api.jar
+ln -s /usr/share/java/jarjar.jar test/target/jarjar.jar
# one testcase requires multiple regular files in $PWD
touch foo.bar
=====================================
debian/tests/spec-jruby
=====================================
@@ -3,7 +3,6 @@
. "$(dirname $0)/common.sh"
prepare
-install_rspec
# run the rspec testsuite
cd "$AUTOPKGTEST_TMP"
=====================================
debian/tests/spec-ruby
=====================================
@@ -3,7 +3,6 @@
. "$(dirname $0)/common.sh"
prepare
-install_rspec
# run the rspec testsuite
cd "$AUTOPKGTEST_TMP"
View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/b608c2ff70a1c71496f90b54fcd7daba9fb5e2ef...716187007e4e959c1554b95deff430c098e3d24e
--
View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/b608c2ff70a1c71496f90b54fcd7daba9fb5e2ef...716187007e4e959c1554b95deff430c098e3d24e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20221209/6ebd64f9/attachment.htm>
More information about the pkg-java-commits
mailing list