Skip to content

Commit 167c3db

Browse files
authored
Omit a test on s390x linux tripping over a git bug
This test has been reliably failing on recent trunk versions. See: <https://github.com/ruby/ruby/actions/runs/19519712433/job/55880266450#step:14:120>
1 parent f5f69d4 commit 167c3db

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

tool/test/test_sync_default_gems.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,9 @@ def test_delete_after_conflict
319319
end
320320

321321
def test_squash_merge
322+
if RUBY_PLATFORM =~ /s390x/
323+
omit("git 2.43.0 bug on s390x ubuntu 24.04: BUG: log-tree.c:1058: did a remerge diff without remerge_objdir?!?")
324+
end
322325
# 2---. <- branch
323326
# / \
324327
# 1---3---3'<- merge commit with conflict resolution

0 commit comments

Comments
 (0)