@@ -440,29 +440,29 @@ def should_print_full_java_command(options, env: {})
440
440
out = ruby_exe ( 'puts RUBY_DESCRIPTION; puts Truffle::System.get_java_property("foo")' , env : env , args : @redirect )
441
441
check_status_and_empty_stderr
442
442
out = out . lines . map ( &:chomp )
443
- out [ 0 ] . should =~ /GraalVM ( CE|EE ) JVM/
443
+ out [ 0 ] . should =~ /( GraalVM CE|GraalVM EE|Oracle GraalVM ) JVM/
444
444
out [ 1 ] . should == 'bar'
445
445
end
446
446
end
447
447
448
448
it "uses --native by default" do
449
449
out = ruby_exe ( nil , options : "--version" , args : @redirect )
450
450
check_status_and_empty_stderr
451
- out . should =~ /GraalVM ( CE|EE ) Native/
451
+ out . should =~ /( GraalVM CE|GraalVM EE|Oracle GraalVM ) Native/
452
452
end
453
453
454
454
it "switches to JVM with --jvm as a Ruby argument" do
455
455
out = ruby_exe ( nil , options : "--jvm #{ @ignore_jvm_thread_warnings } --version" , args : @redirect )
456
456
check_status_and_empty_stderr
457
- out . should =~ /GraalVM ( CE|EE ) JVM/
457
+ out . should =~ /( GraalVM CE|GraalVM EE|Oracle GraalVM ) JVM/
458
458
end
459
459
460
460
it "keeps --jvm as an application argument if given as an application argument" do
461
461
script = fixture ( __FILE__ , "argv.rb" )
462
462
out = ruby_exe ( nil , options : "-v" , args : "#{ script } --jvm 1 2 #{ @redirect } " )
463
463
check_status_and_empty_stderr
464
464
out = out . lines . map ( &:chomp )
465
- out [ 0 ] . should =~ /GraalVM ( CE|EE ) Native/
465
+ out [ 0 ] . should =~ /( GraalVM CE|GraalVM EE|Oracle GraalVM ) Native/
466
466
out . should . include? ( '["--jvm", "1", "2"]' )
467
467
end
468
468
end
0 commit comments