summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Newton <kddnewton@gmail.com>2025-03-18 10:51:45 -0400
committerKevin Newton <kddnewton@gmail.com>2025-03-18 13:36:53 -0400
commit33aaa069a4e7b405e6d7ec5fcbf04a487e36e345 (patch)
tree40ba1b14605417a025ba4ad32195ee03b7a4e670
parent90d38ddb47f557b07b57c88139725267c7c313f8 (diff)
[ruby/prism] Update truffleruby version
https://github.com/ruby/prism/commit/2afe89f8ce
-rw-r--r--test/prism/ruby/parameters_signature_test.rb7
-rw-r--r--test/prism/ruby/ripper_test.rb2
-rw-r--r--tool/bundler/rubocop_gems.rb4
3 files changed, 9 insertions, 4 deletions
diff --git a/test/prism/ruby/parameters_signature_test.rb b/test/prism/ruby/parameters_signature_test.rb
index 9256bcc070..af5b54ed91 100644
--- a/test/prism/ruby/parameters_signature_test.rb
+++ b/test/prism/ruby/parameters_signature_test.rb
@@ -54,9 +54,10 @@ module Prism
assert_parameters([[:keyrest, :**]], "**")
end
- def test_key_ordering
- omit("TruffleRuby returns keys in order they were declared") if RUBY_ENGINE == "truffleruby"
- assert_parameters([[:keyreq, :a], [:keyreq, :b], [:key, :c], [:key, :d]], "a:, c: 1, b:, d: 2")
+ if RUBY_ENGINE != "truffleruby"
+ def test_key_ordering
+ assert_parameters([[:keyreq, :a], [:keyreq, :b], [:key, :c], [:key, :d]], "a:, c: 1, b:, d: 2")
+ end
end
def test_block
diff --git a/test/prism/ruby/ripper_test.rb b/test/prism/ruby/ripper_test.rb
index 4afe377038..d4b278c28e 100644
--- a/test/prism/ruby/ripper_test.rb
+++ b/test/prism/ruby/ripper_test.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-return if RUBY_VERSION < "3.3"
+return if RUBY_VERSION < "3.3" || RUBY_ENGINE == "truffleruby"
require_relative "../test_helper"
diff --git a/tool/bundler/rubocop_gems.rb b/tool/bundler/rubocop_gems.rb
index ab13b1b2c3..53dd52dbb4 100644
--- a/tool/bundler/rubocop_gems.rb
+++ b/tool/bundler/rubocop_gems.rb
@@ -2,7 +2,11 @@
source "https://rubygems.org"
+<<<<<<< HEAD:tool/bundler/rubocop_gems.rb
gem "rubocop", ">= 1.52.1", "< 2"
+=======
+ruby "~> 3.3.5", engine: "truffleruby", engine_version: "~> 24.2.0"
+>>>>>>> 2afe89f8ce (Update truffleruby version):gemfiles/truffleruby/Gemfile
gem "minitest"
gem "irb"