[Git][java-team/jruby][master] 6 commits: d/tests: fix typo
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Mon Jan 9 01:25:44 GMT 2023
Jérôme Charaoui pushed to branch master at Debian Java Maintainers / jruby
Commits:
557ac1f1 by Jérôme Charaoui at 2022-12-28T09:22:26-05:00
d/tests: fix typo
- - - - -
a1da9c70 by Jérôme Charaoui at 2022-12-28T09:22:28-05:00
d/tests: add link to upstream bug report
Gbp-Dch: ignore
- - - - -
c4f177a6 by Jérôme Charaoui at 2023-01-05T16:39:43-05:00
d/tests: fix jgem test
The latest trocla gem added a dependency on the openssl gem, which
tries to compile the native C extension of openssl, but that won't
work with JRuby.
Instead use a barebones gem found on rubygems.org that has a really
simple executable component.
- - - - -
98cde21d by Jérôme Charaoui at 2023-01-08T13:07:36-05:00
d/patches: add patch fixing intermittent test failure
- - - - -
47998d56 by Jérôme Charaoui at 2023-01-08T13:10:32-05:00
d/tests: skip failing tests on armel and armhf
- - - - -
ac6bb31e by Jérôme Charaoui at 2023-01-08T14:59:17-05:00
Update changelog for 9.3.9.0+ds-6 release
- - - - -
6 changed files:
- debian/changelog
- + debian/patches/0011-Fix-intermittent-mri-core-test-failure.patch
- debian/patches/series
- debian/tests/jgem
- debian/tests/mri-stdlib
- debian/tests/spec-ruby
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jruby (9.3.9.0+ds-6) unstable; urgency=medium
+
+ * d/tests: fix jgem test
+ * d/tests: skip failing tests on armel and armhf
+ * d/patches: add patch fixing intermittent test failure
+
+ -- Jérôme Charaoui <jerome at riseup.net> Sun, 08 Jan 2023 13:11:31 -0500
+
jruby (9.3.9.0+ds-5) unstable; urgency=medium
* d/patches: use tags to exclude Etc.sysconf test failures
=====================================
debian/patches/0011-Fix-intermittent-mri-core-test-failure.patch
=====================================
@@ -0,0 +1,21 @@
+From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
+Date: Sun, 8 Jan 2023 13:06:50 -0500
+Subject: Fix intermittent mri-core test failure
+
+Forwarded: https://github.com/jruby/jruby/pull/7567
+---
+ test/mri/ruby/test_enum.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/mri/ruby/test_enum.rb b/test/mri/ruby/test_enum.rb
+index 568fa0e..d34accb 100644
+--- a/test/mri/ruby/test_enum.rb
++++ b/test/mri/ruby/test_enum.rb
+@@ -2,6 +2,7 @@
+ require 'test/unit'
+ EnvUtil.suppress_warning {require 'continuation'}
+ require 'stringio'
++require 'delegate'
+
+ class TestEnumerable < Test::Unit::TestCase
+ def setup
=====================================
debian/patches/series
=====================================
@@ -8,3 +8,4 @@
0009-Fix-testRevision-testcase.patch
0010-Fix-test-failures-related-to-Module-PTY.patch
0011-Remove-failing-test-in-build-environment.patch
+0011-Fix-intermittent-mri-core-test-failure.patch
=====================================
debian/tests/jgem
=====================================
@@ -13,9 +13,9 @@ cd "$AUTOPKGTEST_TMP"
jgem list | grep '^json'
# check if we can install a new gem
-jgem install --bindir ./bin --no-document trocla
+jgem install --bindir ./bin --no-document hello_command_line -v 0.1.0
jgem list > /tmp/jgem_list
-grep "^trocla ([0-9\.]\+)" /tmp/jgem_list
+grep "^hello_command_line ([0-9\.]\+)" /tmp/jgem_list
# invoke the new gem's binary
-jruby -S trocla --version
+jruby -S hello_command_line
=====================================
debian/tests/mri-stdlib
=====================================
@@ -25,7 +25,7 @@ if [ "$(dpkg-architecture -qDEB_BUILD_ARCH)" = "arm64" ]; then
elif [ "$(dpkg-architecture -qDEB_BUILD_ARCH)" = "armel" ] || \
[ "$(dpkg-architecture -qDEB_BUILD_ARCH)" = "armhf" ]; then
{ echo 'exclude :test_cp, "fails in autopkgtest"';
- echo 'exclude :test_cp_r "fails in autopkgtest"';
+ echo 'exclude :test_cp_r, "fails in autopkgtest"';
echo 'exclude :test_uptodate? "fails in autopkgtest"';
} >> test/mri/excludes/TestFileUtils.rb
echo 'exclude :test_failed_path, "fails in autopkgtests"' >> test/mri/excludes/TestIO_Console.rb
@@ -39,7 +39,7 @@ elif [ "$(dpkg-architecture -qDEB_BUILD_ARCH)" = "ppc64el" ]; then
echo 'exclude :test_winsize, "fails in autopkgtests"';
} >> test/mri/excludes/TestIO_Console.rb
elif [ "$(dpkg-architecture -qDEB_BUILD_ARCH)" = "s390x" ]; then
- echo 'exclude :test_uptodate? "fails in autopkgtest"' >> test/mri/excludes/TestFileUtils.rb
+ echo 'exclude :test_uptodate?, "fails in autopkgtest"' >> test/mri/excludes/TestFileUtils.rb
echo 'exclude :test_failed_path, "fails in autopkgtests"' >> test/mri/excludes/TestIO_Console.rb
echo 'exclude :test_utime, "fails in autopkgtests"' >> test/mri/excludes/TestPathname.rb
fi
=====================================
debian/tests/spec-ruby
=====================================
@@ -11,7 +11,22 @@ for n in SC_CHILD_MAX SC_TZNAME_MAX SC_SYMLOOP_MAX; do
done
# skip failing tests on specific architectures
-if [ "$(dpkg-architecture -qDEB_BUILD_ARCH)" = "s390x" ]; then
+if [ "$(dpkg-architecture -qDEB_BUILD_ARCH)" = "armel" ] || \
+ [ "$(dpkg-architecture -qDEB_BUILD_ARCH)" = "armhf" ]; then
+ sed -i '/it.*do$/a skip "skip for autopkgtest"' spec/ruby/core/file/lutime_spec.rb
+ sed -i '/it.*do$/a skip "skip for autopkgtest"' spec/ruby/core/file/utime_spec.rb
+ sed -i '/it "returns the modification Time of the file" do/a skip "skip for autopkgtest"' spec/ruby/core/file/mtime_spec.rb
+ sed -i '/it "returns the modification Time of the file with microseconds" do/a skip "skip for autopkgtest"' spec/ruby/core/file/mtime_spec.rb
+ sed -i '/it "returns the last access time for the named file with microseconds" do/a skip "skip for autopkgtest"' spec/ruby/core/file/atime_spec.rb
+ sed -i '/it "is able to compare files by different modification times" do$/a skip "skip for autopkgtest"' spec/ruby/core/file/stat/comparison_spec.rb
+ sed -i '/it "accepts a length, an offset" do$/a skip "skip for autopkgtest"' spec/ruby/core/io/pread_spec.rb
+ sed -i '/it "accepts a length, an offset, and an output buffer" do$/a skip "skip for autopkgtest"' spec/ruby/core/io/pread_spec.rb
+ sed -i '/it "does not advance the file pointer" do$/a skip "skip for autopkgtest"' spec/ruby/core/io/pread_spec.rb
+ sed -i '/it "raises EOFError if end-of-file is reached" do$/a skip "skip for autopkgtest"' spec/ruby/core/io/pread_spec.rb
+ sed -i '/it "returns the number of bytes written" do$/a skip "skip for autopkgtest"' spec/ruby/core/io/pwrite_spec.rb
+ sed -i '/it "accepts a string and an offset" do$/a skip "skip for autopkgtest"' spec/ruby/core/io/pwrite_spec.rb
+ sed -i '/it "does not advance the pointer in the file" do$/a skip "skip for autopkgtest"' spec/ruby/core/io/pwrite_spec.rb
+elif [ "$(dpkg-architecture -qDEB_BUILD_ARCH)" = "s390x" ]; then
sed -i '/it.*do$/a skip "skip for autopkgtest"' spec/ruby/core/array/pack/shared/float.rb
sed -i '/it.*do$/a skip "skip for autopkgtest"' spec/ruby/core/file/lutime_spec.rb
sed -i '/it.*do$/a skip "skip for autopkgtest"' spec/ruby/core/file/stat/comparison_spec.rb
@@ -25,6 +40,7 @@ fi
# skip failing pack/unpack tests on 32-bit arches (i386, armel and armhf)
# unknown cause, unclear if these failures are expected,
# as upstream does not actually run CI on 32-bit platforms
+# see https://github.com/jruby/jruby/issues/7542
if [ $(dpkg-architecture -qDEB_BUILD_ARCH_BITS) -eq 32 ]; then
sed -i 's/platform_is pointer_size: 32 do/if false/' spec/ruby/core/array/pack/j_spec.rb
sed -i 's/platform_is pointer_size: 32 do/if false/' spec/ruby/core/string/unpack/j_spec.rb
View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/7d65c20ad4cb3db1f6d66c2dcb04e6ae49cee8aa...ac6bb31ebe34a04368f888d9375e9a045df2b171
--
View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/7d65c20ad4cb3db1f6d66c2dcb04e6ae49cee8aa...ac6bb31ebe34a04368f888d9375e9a045df2b171
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/20230109/1c8f32f4/attachment.htm>
More information about the pkg-java-commits
mailing list