Skip to content

Commit

Permalink
[Truffle] jt: allow to run integration tests selectively
Browse files Browse the repository at this point in the history
@pitr-ch
pitr-ch committed Feb 10, 2016
1 parent c82e076 commit e797826
Showing 1 changed file with 18 additions and 11 deletions.
29 changes: 18 additions & 11 deletions tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -52,13 +52,13 @@ def self.find_graal
File.executable?(location)
end
end

def self.find_graal_js
jar = ENV['GRAAL_JS_JAR']
return jar if jar
raise "couldn't find trufflejs.jar - download GraalVM as described in https://github.com/jruby/jruby/wiki/Downloading-GraalVM and find it in there"
end

def self.find_jruby
if USE_JRUBY_ECLIPSE
"#{JRUBY_DIR}/tool/jruby_eclipse"
@@ -68,7 +68,7 @@ def self.find_jruby
"#{JRUBY_DIR}/bin/jruby"
end
end

def self.find_jruby_dir
File.dirname(find_jruby)
end
@@ -430,7 +430,14 @@ def test_integration(*args)
no_gems = args.delete('--no-gems')
env_vars = {}
env_vars["PATH"] = "#{Utilities.find_jruby_dir}:#{ENV["PATH"]}"
Dir["#{JRUBY_DIR}/test/truffle/integration/*.sh"].each do |test_script|

test_names = if args.empty?
'*'
else
'{' + args.join(',') + '}'
end

Dir["#{JRUBY_DIR}/test/truffle/integration/#{test_names}.sh"].each do |test_script|
next if no_gems && File.read(test_script).include?('gem install')
sh env_vars, test_script
end
@@ -558,7 +565,7 @@ def bench(command, *args)
end
raw_sh env_vars, "ruby", *bench_args, *args
end

def metrics(command, *args)
case command
when 'alloc'
@@ -571,7 +578,7 @@ def metrics(command, *args)
raise ArgumentError, command
end
end

def metrics_alloc(*args)
samples = []
METRICS_REPS.times do
@@ -585,7 +592,7 @@ def metrics_alloc(*args)
puts if STDOUT.tty?
puts "#{human_size(samples.inject(:+)/samples.size)}, max #{human_size(samples.max)}"
end

def memory_allocated(trace)
allocated = 0
trace.lines do |line|
@@ -601,7 +608,7 @@ def memory_allocated(trace)
end
allocated
end

def metrics_minheap(*args)
# Why aren't you doing a binary search? The results seem pretty noisy so
# unless you do reps at each level I'm not sure how to make it work
@@ -625,7 +632,7 @@ def metrics_minheap(*args)
puts if STDOUT.tty?
puts "#{heap} MB"
end

def metrics_time(*args)
samples = []
METRICS_REPS.times do
@@ -644,7 +651,7 @@ def metrics_time(*args)
puts "#{region} #{(region_samples.inject(:+)/samples.size).round(2)} s"
end
end

def get_times(trace, total)
start_times = {}
times = {}
@@ -672,7 +679,7 @@ def get_times(trace, total)
times['unaccounted'] = total - accounted_for
times
end

This comment has been minimized.

Sign in to view

Copy link
@chrisseaton

chrisseaton Feb 10, 2016

Contributor

Check your editor isn't changing whitespace automatically (unless you think this is an important change for some reason).

This comment has been minimized.

Sign in to view

Copy link
@pitr-ch

pitr-ch Feb 15, 2016

Author Member

It's of minor importance. No trailing spaces is a simple rule (which can be usually enforced by an editor) that should prevent pollution of commits with a white-space changes assuming everybody has the same setting enabled. I do not remember that we ever discussed it though, I am just used to do it this way. Therefore I've kept the white-space removal there. I should have done an extra commit though.
def human_size(bytes)
if bytes < 1024
"#{bytes} B"

0 comments on commit e797826

Please sign in to comment.