mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-27 12:34:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Omit a test on s390x linux tripping over a git bug

Browse Source 
This test has been reliably failing on recent trunk versions.

See: <https://github.com/ruby/ruby/actions/runs/19519712433/job/55880266450#step:14:120>
This commit is contained in:
Alan Wu 2025-11-19 19:03:23 -05:00 committed by GitHub
parent f5f69d4114
commit 167c3dbaa0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
Notes: git 2025-11-20 00:03:52 +00:00 
Merged: https://github.com/ruby/ruby/pull/15252

Merged-By: XrXr
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tool/test/test_sync_default_gems.rb
View File

@ -319,6 +319,9 @@ module Test_SyncDefaultGems
end
def test_squash_merge
if RUBY_PLATFORM =~ /s390x/
omit("git 2.43.0 bug on s390x ubuntu 24.04: BUG: log-tree.c:1058: did a remerge diff without remerge_objdir?!?")
end
# 2---. <- branch
# / \
# 1---3---3'<- merge commit with conflict resolution