diff options
| author | Alan Wu <XrXr@users.noreply.github.com> | 2025-11-19 19:03:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-20 00:03:23 +0000 |
| commit | 167c3dbaa052d7ad34c374fc6c5f2cceab76b3ac (patch) | |
| tree | 02ac92da0b4222e06723d7b3e449a8587eb63ea7 | |
| parent | f5f69d41146d5e17e93ec5b219ae6f5ecd59e38b (diff) | |
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>
| -rwxr-xr-x | tool/test/test_sync_default_gems.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tool/test/test_sync_default_gems.rb b/tool/test/test_sync_default_gems.rb index cdbbb0c539..4a2688850b 100755 --- a/tool/test/test_sync_default_gems.rb +++ b/tool/test/test_sync_default_gems.rb @@ -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 |