[GR-44722] Prepare for change of Truffle runtime name.

PullRequest: truffleruby/3732

Author: fniephaus

spec/truffle/identity_spec.rb

@@ -38,15 +38,16 @@
 
   guard -> { !TruffleRuby.native? } do
     it "RUBY_DESCRIPTION indicates which VM TruffleRuby runs on and which edition" do
-      RUBY_DESCRIPTION.should =~ /\b(Interpreted JVM|GraalVM CE JVM|GraalVM EE JVM)\b/
+      RUBY_DESCRIPTION.should =~ /\b(Interpreted|GraalVM CE|GraalVM EE|Oracle GraalVM) JVM\b/
       RUBY_DESCRIPTION.should_not include("Native")
       RUBY_DESCRIPTION.should_not include("native")
     end
   end
 
   guard -> { TruffleRuby.native? } do
     it "RUBY_DESCRIPTION indicates TruffleRuby runs on SVM and which edition" do
-      RUBY_DESCRIPTION.should =~ /\b(GraalVM CE Native|GraalVM EE Native)\b/
+      RUBY_DESCRIPTION.should =~ /\b(GraalVM CE|GraalVM EE|Oracle GraalVM) Native\b/
+      RUBY_DESCRIPTION.should_not include("JVM")
     end
   end
 

spec/truffle/launcher_spec.rb

@@ -440,29 +440,29 @@ def should_print_full_java_command(options, env: {})
           out = ruby_exe('puts RUBY_DESCRIPTION; puts Truffle::System.get_java_property("foo")', env: env, args: @redirect)
           check_status_and_empty_stderr
           out = out.lines.map(&:chomp)
-          out[0].should =~ /GraalVM (CE|EE) JVM/
+          out[0].should =~ /(GraalVM CE|GraalVM EE|Oracle GraalVM) JVM/
           out[1].should == 'bar'
         end
       end
 
       it "uses --native by default" do
         out = ruby_exe(nil, options: "--version", args: @redirect)
         check_status_and_empty_stderr
-        out.should =~ /GraalVM (CE|EE) Native/
+        out.should =~ /(GraalVM CE|GraalVM EE|Oracle GraalVM) Native/
       end
 
       it "switches to JVM with --jvm as a Ruby argument" do
         out = ruby_exe(nil, options: "--jvm #{@ignore_jvm_thread_warnings} --version", args: @redirect)
         check_status_and_empty_stderr
-        out.should =~ /GraalVM (CE|EE) JVM/
+        out.should =~ /(GraalVM CE|GraalVM EE|Oracle GraalVM) JVM/
       end
 
       it "keeps --jvm as an application argument if given as an application argument" do
         script = fixture(__FILE__, "argv.rb")
         out = ruby_exe(nil, options: "-v", args: "#{script} --jvm 1 2 #{@redirect}")
         check_status_and_empty_stderr
         out = out.lines.map(&:chomp)
-        out[0].should =~ /GraalVM (CE|EE) Native/
+        out[0].should =~ /(GraalVM CE|GraalVM EE|Oracle GraalVM) Native/
         out.should.include?('["--jvm", "1", "2"]')
       end
     end

test/mri/excludes/TestTimeTZ.rb

@@ -2,3 +2,4 @@
 exclude :test_localtime_zone, "<\"SGT\"> expected but was"
 exclude :test_utc_names, "ArgumentError: \"+HH:MM\", \"-HH:MM\", \"UTC\" or \"A\"..\"I\",\"K\"..\"Z\" expected for utc_offset: utc"
 exclude :test_america_los_angeles, "TypeError: TruffleRuby doesn't have a case for the org.truffleruby.core.time.TimeNodesFactory$TimeSFromArrayPrimitiveNodeFactory$TimeSFromArrayPrimitiveNodeGen node with values of type Class(org.truffleruby.core.klass.RubyClass) org.truffleruby.language.Nil java.lang.Integer=0 java.lang.Integer=0 java.lang.Integer=1 java.lang.Integer=1 org.truffleruby.core.numeric.RubyBignum org.truffleruby.language.Nil java.lang.Integer=-1 java.lang.Boolean=false org.truffleruby.language.Nil"
+exclude :test_europe_lisbon, "TypeError: TruffleRuby doesn't have a case for the org.truffleruby.core.time.TimeNodesFactory$TimeSFromArrayPrimitiveNodeFactory$TimeSFromArrayPrimitiveNodeGen node with values of type Class(org.truffleruby.core.klass.RubyClass) org.truffleruby.language.Nil java.lang.Integer=0 java.lang.Integer=0 java.lang.Integer=1 java.lang.Integer=1 org.truffleruby.core.numeric.RubyBignum org.truffleruby.language.Nil java.lang.Integer=-1 java.lang.Boolean=false org.truffleruby.language.Nil"