[Git][java-team/jruby][master] 8 commits: d/jruby.links: add missing libjffi symlinks
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Sat Dec 10 19:23:39 GMT 2022
Jérôme Charaoui pushed to branch master at Debian Java Maintainers / jruby
Commits:
797ef351 by Jérôme Charaoui at 2022-12-10T09:39:01-05:00
d/jruby.links: add missing libjffi symlinks
This should help with support on other architectures.
- - - - -
be094a9b by Jérôme Charaoui at 2022-12-10T09:43:10-05:00
d/patches: remove SC_CHILD_MAX in Etc.sysconf test
- - - - -
31d5e59b by Jérôme Charaoui at 2022-12-10T14:04:06-05:00
d/tests: /usr/share/jruby path not needed in GEM_PATH
This was thought to be able to fix the Gem.bin_path test, but it did
not.
- - - - -
47d03190 by Jérôme Charaoui at 2022-12-10T14:04:17-05:00
d/tests: add debug_tests helper function
- - - - -
ef0ad36c by Jérôme Charaoui at 2022-12-10T14:04:32-05:00
d/tests: remove unneeded -J-Djruby.gem.home
Gbp-Dch: ignore
- - - - -
7c6ef21b by Jérôme Charaoui at 2022-12-10T14:05:40-05:00
d/tests: exclude a problematic http testcase
I suspect this one is behind the mri-stdlib autopkgtest hang/timeout
issue.
- - - - -
441c3785 by Jérôme Charaoui at 2022-12-10T14:05:54-05:00
d/tests: enable debug_tests in mri-stdlib
This should help pinpoint the cause of this test's timeouts in debci.
- - - - -
76aae107 by Jérôme Charaoui at 2022-12-10T14:07:16-05:00
Update changelog for 9.3.9.0+ds-3 release
- - - - -
6 changed files:
- debian/changelog
- debian/jruby.links
- debian/patches/0007-Workaround-sysconf-test-failure.patch → debian/patches/0007-Fix-Etc-sysconf-test-case-failure.patch
- debian/patches/series
- debian/tests/common.sh
- debian/tests/mri-stdlib
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+jruby (9.3.9.0+ds-3) unstable; urgency=medium
+
+ * d/jruby.links: add missing libjffi symlinks
+ * d/patches: remove SC_CHILD_MAX in Etc.sysconf test
+ * d/tests:
+ + exclude a problematic http testcase
+ + add debug_tests helper function
+ + enable debug_tests in mri-stdlib
+
+ -- Jérôme Charaoui <jerome at riseup.net> Sat, 10 Dec 2022 14:02:13 -0500
+
jruby (9.3.9.0+ds-2) unstable; urgency=medium
* d/control: add Breaks+Replaces on jruby-openssl (Closes: #1025442)
=====================================
debian/jruby.links
=====================================
@@ -14,12 +14,18 @@ usr/share/java/jansi1.jar usr/share/jruby/lib/jansi1.jar
usr/share/java/jline2.jar usr/share/jruby/lib/jline2.jar
usr/share/java/snakeyaml.jar usr/share/jruby/lib/snakeyaml.jar
-usr/lib/i386-linux-gnu/jni/libjffi-1.2.so usr/share/jruby/lib/jni/i386-Linux/libjffi-1.2.so
-usr/lib/x86_64-linux-gnu/jni/libjffi-1.2.so usr/share/jruby/lib/jni/x86_64-Linux/libjffi-1.2.so
-usr/lib/arm-linux-gnueabi/jni/libjffi-1.2.so usr/share/jruby/lib/jni/arm-Linux/libjffi-1.2.so
usr/lib/aarch64-linux-gnu/jni/libjffi-1.2.so usr/share/jruby/lib/jni/aarch64-Linux/libjffi-1.2.so
+usr/lib/arm-linux-gnueabi/jni/libjffi-1.2.so usr/share/jruby/lib/jni/arm-Linux/libjffi-1.2.so
+usr/lib/arm64-linux-gnueabi/jni/libjffi-1.2.so usr/share/jruby/lib/jni/arm-Linux/libjffi-1.2.so
+usr/lib/i386-linux-gnu/jni/libjffi-1.2.so usr/share/jruby/lib/jni/i386-Linux/libjffi-1.2.so
+usr/lib/mipsel-linux-gnu/jni/libjffi-1.2.so usr/share/jruby/lib/jni/mipsel-Linux/libjffi-1.2.so
+usr/lib/mips64el-linux-gnu/jni/libjffi-1.2.so usr/share/jruby/lib/jni/mips46el-Linux/libjffi-1.2.so
usr/lib/powerpc64-linux-gnu/jni/libjffi-1.2.so usr/share/jruby/lib/jni/ppc64-Linux/libjffi-1.2.so
usr/lib/powerpc64le-linux-gnu/jni/libjffi-1.2.so usr/share/jruby/lib/jni/ppc64le-Linux/libjffi-1.2.so
+usr/lib/riscv64-linux-gnu/jni/libjffi-1.2.so usr/share/jruby/lib/jni/riscv64-Linux/libjffi-1.2.so
+usr/lib/s390x-linux-gnu/jni/libjffi-1.2.so usr/share/jruby/lib/jni/s390x-Linux/libjffi-1.2.so
+usr/lib/sparc64-linux-gnu/jni/libjffi-1.2.so usr/share/jruby/lib/jni/sparc64-Linux/libjffi-1.2.so
+usr/lib/x86_64-linux-gnu/jni/libjffi-1.2.so usr/share/jruby/lib/jni/x86_64-Linux/libjffi-1.2.so
usr/share/fonts/truetype/lato/Lato-Italic.ttf usr/share/jruby/lib/ruby/stdlib/rdoc/generator/template/darkfish/fonts/Lato-RegularItalic.ttf
usr/share/fonts/truetype/lato/Lato-LightItalic.ttf usr/share/jruby/lib/ruby/stdlib/rdoc/generator/template/darkfish/fonts/Lato-LightItalic.ttf
=====================================
debian/patches/0007-Workaround-sysconf-test-failure.patch → debian/patches/0007-Fix-Etc-sysconf-test-case-failure.patch
=====================================
@@ -1,24 +1,26 @@
From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
Date: Wed, 16 Nov 2022 08:32:17 -0500
-Subject: Workaround sysconf test failure
+Subject: Fix Etc.sysconf test case failure
-During this test both SC_SYMLOOP_MAX and SC_TZNAME_MAX are not
-available and querying those values results in EINVAL. Since
-this is likely because of build environment differences, we
-remove checking those two variables.
+During this test some values are not available and querying those values
+results in EINVAL. Since this is likely because of build environment
+differences, we remove checking those two variables.
Forwarded: not-needed
---
- spec/ruby/library/etc/sysconf_spec.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ spec/ruby/library/etc/sysconf_spec.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/spec/ruby/library/etc/sysconf_spec.rb b/spec/ruby/library/etc/sysconf_spec.rb
-index e7d59d1..74f91e8 100644
+index e7d59d1..93d460c 100644
--- a/spec/ruby/library/etc/sysconf_spec.rb
+++ b/spec/ruby/library/etc/sysconf_spec.rb
-@@ -6,7 +6,7 @@ platform_is_not :windows do
+@@ -4,9 +4,9 @@ require 'etc'
+ platform_is_not :windows do
+ describe "Etc.sysconf" do
%w[
- SC_ARG_MAX SC_CHILD_MAX SC_HOST_NAME_MAX SC_LOGIN_NAME_MAX SC_NGROUPS_MAX
+- SC_ARG_MAX SC_CHILD_MAX SC_HOST_NAME_MAX SC_LOGIN_NAME_MAX SC_NGROUPS_MAX
++ SC_ARG_MAX SC_HOST_NAME_MAX SC_LOGIN_NAME_MAX SC_NGROUPS_MAX
SC_CLK_TCK SC_OPEN_MAX SC_PAGESIZE SC_RE_DUP_MAX SC_STREAM_MAX
- SC_SYMLOOP_MAX SC_TTY_NAME_MAX SC_TZNAME_MAX SC_VERSION
+ SC_TTY_NAME_MAX SC_VERSION
=====================================
debian/patches/series
=====================================
@@ -4,7 +4,7 @@
0004-Disable-copy-rename-maven-plugin.patch
0005-Disable-jnr-ffi-native-usage.patch
0006-Disable-test-requiring-Awaitility.patch
-0007-Workaround-sysconf-test-failure.patch
+0007-Fix-Etc-sysconf-test-case-failure.patch
0008-Fix-jruby-base-java-testsuite-failures.patch
0009-Fix-testRevision-testcase.patch
0010-Fix-test-failures-related-to-Module-PTY.patch
=====================================
debian/tests/common.sh
=====================================
@@ -10,5 +10,15 @@ prepare() {
export CI=1
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
+ export GEM_PATH=/usr/share/rubygems-integration/all:/usr/lib/ruby/gems/3.1.0
+}
+
+# run 1 test at a time and output test names
+# so we can more easily catch hanging tests
+debug_tests() {
+ export JOBS=1
+ # modifies ADDITIONAL_TEST_OPTIONS
+ sed -i 's/--tty=no/-v/' "$AUTOPKGTEST_TMP/rakelib/test.rake"
+ # modifies TESTOPT
+ sed -i 's/--no-use-color/--no-use-color -v/' "$AUTOPKGTEST_TMP/rakelib/test.rake"
}
=====================================
debian/tests/mri-stdlib
=====================================
@@ -3,6 +3,7 @@
. "$(dirname $0)/common.sh"
prepare
+debug_tests
cd "$AUTOPKGTEST_TMP"
@@ -15,5 +16,8 @@ echo 'exclude :test_cp_r_symlink_preserve, "fails in autopkgtests"' >> test/mri/
mkdir test/mri/excludes/TestDigest
echo 'exclude :test_initialize_copy_md5_rmd160, "fails in autopkgtests"' >> test/mri/excludes/TestDigest/TestInitCopy.rb
+# Causes the test to hang/timeout for an unknown reason
+echo 'exclude :test_get__break, "fails in autopkgtests"' >> test/mri/excludes/TestNetHTTP_v1_2.rb
+
# run the rspec testsuite
-jruby -J-Djruby.gem.home=/usr/share/rubygems-integration/all -S rake test:mri:stdlib
+jruby -S rake test:mri:stdlib
View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/716187007e4e959c1554b95deff430c098e3d24e...76aae107e3ac5b3af22bf35d89b51fe6365fc1ed
--
View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/716187007e4e959c1554b95deff430c098e3d24e...76aae107e3ac5b3af22bf35d89b51fe6365fc1ed
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/20221210/334ca58e/attachment.htm>
More information about the pkg-java-commits
mailing list