Skip to content

Commit edde959

Browse files
authored
Merge pull request #447 from eregon/remove-continue-on-error-tests
Remove continue-on-error for "rake test" on truffleruby and skip problematic tests
2 parents a8cd2d6 + ffb3ee1 commit edde959

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

.github/workflows/test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ jobs:
3636

3737
- name: Run tests
3838
run: rake test
39-
continue-on-error: ${{ matrix.ruby == 'truffleruby' }}
4039

4140
benchmark-default:
4241
runs-on: ubuntu-latest

Rakefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ desc 'Run all tests'
66
Rake::TestTask.new(:test) do |t|
77
t.libs << 'test'
88
t.libs << 'lib'
9-
t.test_files = FileList['test/**/*_test.rb']
9+
test_files = FileList['test/**/*_test.rb']
10+
if RUBY_ENGINE == 'truffleruby'
11+
# rmagick segfaults on truffleruby 25.0.0
12+
test_files -= ['test/graph_renderer_test.rb']
13+
end
14+
t.test_files = test_files
1015
t.verbose = true
1116
t.warning = true
1217
end

test/benchmark_runner_cli_test.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,13 @@
3333

3434
# Helper method to create args directly without parsing
3535
def create_args(overrides = {})
36+
if RUBY_ENGINE == 'truffleruby'
37+
executables = { 'truffleruby' => [RbConfig.ruby] }
38+
else
39+
executables = { 'interp' => [RbConfig.ruby], 'yjit' => [RbConfig.ruby, '--yjit'] }
40+
end
3641
defaults = {
37-
executables: { 'interp' => [RbConfig.ruby], 'yjit' => [RbConfig.ruby, '--yjit'] },
42+
executables: executables,
3843
out_path: nil,
3944
out_override: nil,
4045
harness: 'harness',

test/benchmark_runner_test.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,7 @@
497497

498498
describe '.render_graph' do
499499
it 'delegates to GraphRenderer and returns calculated png_path' do
500+
skip 'rmagick segfaults on truffleruby 25.0.0' if RUBY_ENGINE == 'truffleruby'
500501
Dir.mktmpdir do |dir|
501502
json_path = File.join(dir, 'test.json')
502503
expected_png_path = File.join(dir, 'test.png')

0 commit comments

Comments
 (0)