Skip to content

Commit 125884d

Browse files
committed
Prepare for change of Truffle runtime name.
1 parent c4d815c commit 125884d

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

spec/truffle/identity_spec.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,16 @@
3838

3939
guard -> { !TruffleRuby.native? } do
4040
it "RUBY_DESCRIPTION indicates which VM TruffleRuby runs on and which edition" do
41-
RUBY_DESCRIPTION.should =~ /\b(Interpreted JVM|GraalVM CE JVM|GraalVM EE JVM)\b/
41+
RUBY_DESCRIPTION.should =~ /\b(Interpreted|GraalVM CE|GraalVM EE|Oracle GraalVM) JVM\b/
4242
RUBY_DESCRIPTION.should_not include("Native")
4343
RUBY_DESCRIPTION.should_not include("native")
4444
end
4545
end
4646

4747
guard -> { TruffleRuby.native? } do
4848
it "RUBY_DESCRIPTION indicates TruffleRuby runs on SVM and which edition" do
49-
RUBY_DESCRIPTION.should =~ /\b(GraalVM CE Native|GraalVM EE Native)\b/
49+
RUBY_DESCRIPTION.should =~ /\b(GraalVM CE|GraalVM EE|Oracle GraalVM) Native\b/
50+
RUBY_DESCRIPTION.should_not include("JVM")
5051
end
5152
end
5253

spec/truffle/launcher_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -440,29 +440,29 @@ def should_print_full_java_command(options, env: {})
440440
out = ruby_exe('puts RUBY_DESCRIPTION; puts Truffle::System.get_java_property("foo")', env: env, args: @redirect)
441441
check_status_and_empty_stderr
442442
out = out.lines.map(&:chomp)
443-
out[0].should =~ /GraalVM (CE|EE) JVM/
443+
out[0].should =~ /(GraalVM CE|GraalVM EE|Oracle GraalVM) JVM/
444444
out[1].should == 'bar'
445445
end
446446
end
447447

448448
it "uses --native by default" do
449449
out = ruby_exe(nil, options: "--version", args: @redirect)
450450
check_status_and_empty_stderr
451-
out.should =~ /GraalVM (CE|EE) Native/
451+
out.should =~ /(GraalVM CE|GraalVM EE|Oracle GraalVM) Native/
452452
end
453453

454454
it "switches to JVM with --jvm as a Ruby argument" do
455455
out = ruby_exe(nil, options: "--jvm #{@ignore_jvm_thread_warnings} --version", args: @redirect)
456456
check_status_and_empty_stderr
457-
out.should =~ /GraalVM (CE|EE) JVM/
457+
out.should =~ /(GraalVM CE|GraalVM EE|Oracle GraalVM) JVM/
458458
end
459459

460460
it "keeps --jvm as an application argument if given as an application argument" do
461461
script = fixture(__FILE__, "argv.rb")
462462
out = ruby_exe(nil, options: "-v", args: "#{script} --jvm 1 2 #{@redirect}")
463463
check_status_and_empty_stderr
464464
out = out.lines.map(&:chomp)
465-
out[0].should =~ /GraalVM (CE|EE) Native/
465+
out[0].should =~ /(GraalVM CE|GraalVM EE|Oracle GraalVM) Native/
466466
out.should.include?('["--jvm", "1", "2"]')
467467
end
468468
end

0 commit comments

Comments
 (0)