[GR-17722] GraalVM tests fixes.

PullRequest: truffleruby/1254

Author: eregon

test/truffle/integration/no_extra_output.sh

@@ -27,15 +27,15 @@ function check() {
 
 echo "Basic test of the output"
 
-jt --silent ruby -e 'puts 3*4' 1>temp.txt 2>&1
+$RUBY_BIN -e 'puts 3*4' 1>temp.txt 2>&1
 check $?
 
 echo "Basic test of the output with lazy options disabled"
 
-jt --silent ruby --lazy-default=false -e 'puts 3*4' 1>temp.txt 2>&1
+$RUBY_BIN --experimental-options --lazy-default=false -e 'puts 3*4' 1>temp.txt 2>&1
 check $?
 
 echo "Test loading many standard libraries"
 
-jt --silent ruby --lazy-default=false test/truffle/integration/no_extra_output/all_stdlibs.rb 1>temp.txt 2>&1
+$RUBY_BIN --experimental-options --lazy-default=false test/truffle/integration/no_extra_output/all_stdlibs.rb 1>temp.txt 2>&1
 check $?

tool/jt.rb

@@ -185,16 +185,19 @@ def ruby_launcher
     return @ruby_launcher if defined? @ruby_launcher
 
     @ruby_name ||= ENV['RUBY_BIN'] || 'jvm'
-    @ruby_launcher = if @ruby_name == 'ruby'
-                       ENV['RBENV_ROOT'] ? `rbenv which ruby`.chomp : which('ruby')
-                     elsif File.executable?(@ruby_name)
-                       @ruby_name
-                     else
-                       "#{TRUFFLERUBY_DIR}/mxbuild/truffleruby-#{@ruby_name}/#{language_dir}/ruby/bin/ruby"
-                     end
+    ruby_launcher = if @ruby_name == 'ruby'
+                      ENV['RBENV_ROOT'] ? `rbenv which ruby`.chomp : which('ruby')
+                    elsif File.executable?(@ruby_name)
+                      @ruby_name
+                    else
+                      "#{TRUFFLERUBY_DIR}/mxbuild/truffleruby-#{@ruby_name}/#{language_dir}/ruby/bin/ruby"
+                    end
 
-    raise "The Ruby executable #{@ruby_launcher} does not exist" unless File.exist?(@ruby_launcher)
-    raise "The Ruby executable #{@ruby_launcher} is not executable" unless File.executable?(@ruby_launcher)
+    raise "The Ruby executable #{ruby_launcher} does not exist" unless File.exist?(ruby_launcher)
+    ruby_launcher = File.realpath(ruby_launcher)
+
+    raise "The Ruby executable #{ruby_launcher} is not executable" unless File.executable?(ruby_launcher)
+    @ruby_launcher = ruby_launcher
 
     unless @silent
       shortened_path = @ruby_launcher.sub(%r[^#{Regexp.escape TRUFFLERUBY_DIR}/], '').sub(%r[/bin/ruby$], '').sub(%r[/#{language_dir}/ruby$], '')
@@ -210,9 +213,12 @@ def ruby_launcher
     ENV['RUBY_BIN'] = ruby_launcher
     @ruby_launcher
   end
-
   alias_method :require_ruby_launcher!, :ruby_launcher
 
+  def ruby_home
+    File.expand_path('../..', ruby_launcher)
+  end
+
   def truffleruby_native!
     unless truffleruby_native?
       raise "The ruby executable #{ruby_launcher} is not native."
@@ -239,8 +245,7 @@ def truffleruby_compiler?
     return @truffleruby_compiler = true if truffleruby_native?
 
     # Detect if the compiler is present by reading the $graalvm_home/release file
-    # Use realpath to always use the executable in languages/ruby/bin/
-    graalvm_home = File.expand_path("../../../..#{'/..' * language_dir.count('/')}", File.realpath(ruby_launcher))
+    graalvm_home = File.expand_path("..#{'/..' * (language_dir.count('/') + 1)}", ruby_home)
     @truffleruby_compiler = File.readlines("#{graalvm_home}/release").grep(/^COMMIT_INFO=/).any? do |line|
       line.include?('"compiler":') || line.include?("'compiler':")
     end
@@ -907,7 +912,7 @@ def test(*args)
       # TODO (eregon, 4 Feb 2019): This should run on GraalVM, not development jars
       # The home needs to be set, otherwise TruffleFile does not allow access to files in the TruffleRuby home,
       # because it cannot find the correct home.
-      home = "-Druby.home=#{TRUFFLERUBY_DIR}/mxbuild/truffleruby-jvm/#{language_dir}/ruby"
+      home = "-Druby.home=#{ruby_home}"
       mx 'unittest', home, *tests
     when 'tck' then mx 'tck', *rest
     else
@@ -1143,7 +1148,7 @@ def retag(*args)
 
         # Test that running the post-install hook works, even when opt &
         # llvm-link are not on PATH, as it is the case on macOS.
-        sh({'TRUFFLERUBY_RECOMPILE_OPENSSL' => 'true'}, "mxbuild/truffleruby-jvm/#{language_dir}/ruby/lib/truffle/post_install_hook.sh")
+        sh({'TRUFFLERUBY_RECOMPILE_OPENSSL' => 'true'}, "#{ruby_home}/lib/truffle/post_install_hook.sh")
 
       when 'gems'
         # Test that we can compile and run some real C extensions
@@ -1745,8 +1750,6 @@ def format_time_metrics(*args)
   end
 
   def benchmark(*args)
-    require_ruby_launcher!
-
     vm_args = []
     if truffleruby?
       vm_args << '--experimental-options' << '--engine.CompilationExceptionsAreFatal'