Skip to content

Commit

Permalink
Showing 1 changed file with 26 additions and 29 deletions.
55 changes: 26 additions & 29 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -73,10 +73,10 @@ def self.find_graal_javacmd_and_options
vm_args = command_line.split
vm_args.pop # Drop "-version"
javacmd = vm_args.shift
if Dir.exist?(File.join(graal_home, 'mx.sulong'))
sulong_dependencies = File.join(graal_home, 'lib', '*')
sulong_jar = File.join(graal_home, 'build', 'sulong.jar')
nfi_classes = File.join(graal_home, '../graal-core/mxbuild/graal/com.oracle.nfi/bin')
if Dir.exist?("#{graal_home}/mx.sulong")
sulong_dependencies = "#{graal_home}/lib/*"
sulong_jar = "#{graal_home}/build/sulong.jar"
nfi_classes = File.expand_path('../graal-core/mxbuild/graal/com.oracle.nfi/bin', graal_home)
vm_args << '-cp'
vm_args << [nfi_classes, sulong_dependencies, sulong_jar].join(':')
vm_args << '-XX:-UseJVMCIClassLoader'
@@ -227,38 +227,33 @@ def system_timeout(timeout, *args)
end

def raw_sh(*args)
continue_on_failure = false
use_exec = false
if args.last.is_a?(Hash)
continue_on_failure = true if args.last.delete(:continue_on_failure)
use_exec = true if args.last.delete(:use_exec)
end
if !args.last.is_a?(Hash) || !args.last.delete(:no_print_cmd)
options = args.last.is_a?(Hash) ? args.pop : {}
continue_on_failure = options[:continue_on_failure]
use_exec = options[:use_exec]
timeout = options[:timeout]

unless options[:no_print_cmd]
STDERR.puts "$ #{printable_cmd(args)}"
end
timeout = nil
if args.last.is_a?(Hash)
timeout = args.last.delete(:timeout)
end

if use_exec
result = exec(*args)
elsif timeout
result = system_timeout(timeout, *args)
else
result = system(*args)
end

if result
true
elsif continue_on_failure
false
else
if continue_on_failure
false
$stderr.puts "FAILED (#{$?}): #{printable_cmd(args)}"
if $? and $?.exitstatus
exit $?.exitstatus
else
$stderr.puts "FAILED (#{$?}): #{printable_cmd(args)}"
if $? and $?.exitstatus
exit $?.exitstatus
else
exit 1
end
exit 1
end
end
end
@@ -506,8 +501,10 @@ def run(*args)
end
end

args.push({use_exec: true}) if args.delete('--exec')

if args.delete('--exec')
args << { use_exec: true }
end

raw_sh env_vars, Utilities.find_jruby, *jruby_args, *args
end
alias ruby run
@@ -607,8 +604,8 @@ def test_compiler(*args)
def test_cexts(*args)
begin
output_file = 'cext-output.txt'
['minimum', 'method', 'module'].each do |gem|
dir = "#{JRUBY_DIR}/test/truffle/cexts/#{gem}"
['minimum', 'method', 'module'].each do |gem_name|
dir = "#{JRUBY_DIR}/test/truffle/cexts/#{gem_name}"
sh Utilities.find_jruby, "#{JRUBY_DIR}/bin/jruby-cext-c", dir
name = File.basename(dir)
run '--graal', '-I', "#{dir}/lib", "#{dir}/bin/#{name}", :out => output_file
@@ -619,8 +616,8 @@ def test_cexts(*args)
ensure
File.delete output_file rescue nil
end
['oily_png', 'psd_native'].each do |gem|
config = "#{JRUBY_DIR}/test/truffle/cexts/#{gem}"
['oily_png', 'psd_native'].each do |gem_name|
config = "#{JRUBY_DIR}/test/truffle/cexts/#{gem_name}"
sh Utilities.find_jruby, "#{JRUBY_DIR}/bin/jruby-cext-c", config
end
end

0 comments on commit 8d795a9

Please sign in to comment.