Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f1d58750b47b
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ac595959741f
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 1, 2016

  1. Copy the full SHA
    bb7e22e View commit details
  2. Copy the full SHA
    ac59595 View commit details
Showing with 17 additions and 10 deletions.
  1. +4 −4 ci.hocon
  2. +2 −2 mx.jruby/mx_jruby.py
  3. +11 −4 tool/jt.rb
8 changes: 4 additions & 4 deletions ci.hocon
Original file line number Diff line number Diff line change
@@ -98,7 +98,7 @@ jruby-noindy-metrics: {
GUEST_VM: jruby,
GUEST_VM_CONFIG: noindy,
JRUBY_OPTS: "-Xclassic -Xcompile.invokedynamic=false",
MX_BENCHMARK_OPTS: --no-graal
MX_NO_GRAAL: "true"
}
}

@@ -107,7 +107,7 @@ jruby-noindy-benchmark: {
GUEST_VM: jruby,
GUEST_VM_CONFIG: noindy,
JRUBY_OPTS: "-Xclassic -X+C -Xcompile.invokedynamic=false",
MX_BENCHMARK_OPTS: --no-graal
MX_NO_GRAAL: "true"
}
}

@@ -116,7 +116,7 @@ jruby-indy-metrics: {
GUEST_VM: jruby,
GUEST_VM_CONFIG: indy,
JRUBY_OPTS: "-Xclassic -Xcompile.invokedynamic=true",
MX_BENCHMARK_OPTS: --no-graal
MX_NO_GRAAL: "true"
}
}

@@ -125,7 +125,7 @@ jruby-indy-benchmark: {
GUEST_VM: jruby,
GUEST_VM_CONFIG: indy,
JRUBY_OPTS: "-Xclassic -X+C -Xcompile.invokedynamic=true",
MX_BENCHMARK_OPTS: --no-graal
MX_NO_GRAAL: "true"
}
}

4 changes: 2 additions & 2 deletions mx.jruby/mx_jruby.py
Original file line number Diff line number Diff line change
@@ -329,8 +329,8 @@ def directory(self):

def runBenchmark(self, benchmark, bmSuiteArgs):
arguments = ['benchmark']
if 'MX_BENCHMARK_OPTS' in os.environ:
arguments.extend(os.environ['MX_BENCHMARK_OPTS'].split(' '))
if 'MX_NO_GRAAL' in os.environ:
arguments.extend('--no-graal')
arguments.extend(['--simple', '--elapsed'])
arguments.extend(['--time', str(self.time())])
if ':' in benchmark:
15 changes: 11 additions & 4 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -240,8 +240,10 @@ def system_timeout(timeout, *args)

def raw_sh(*args)
continue_on_failure = false
if args.last.is_a?(Hash) && args.last.delete(:continue_on_failure)
continue_on_failure = true
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)
STDERR.puts "$ #{printable_cmd(args)}"
@@ -250,7 +252,9 @@ def raw_sh(*args)
if args.last.is_a?(Hash)
timeout = args.last.delete(:timeout)
end
if timeout
if use_exec
result = exec(*args)
elsif timeout
result = system_timeout(timeout, *args)
else
result = system(*args)
@@ -359,6 +363,7 @@ def help
puts ' --full show all phases, not just up to the Truffle partial escape'
puts " --jdebug run a JDWP debug server on #{JDEBUG_PORT}"
puts ' --jexception[s] print java exceptions'
puts ' --exec use exec rather than system'
puts 'jt e 14 + 2 evaluate an expression'
puts 'jt puts 14 + 2 evaluate and print an expression'
puts 'jt test run all mri tests, specs and integration tests'
@@ -517,7 +522,9 @@ def run(*args)
jruby_args += %w[-J-G:Dump=TrufflePartialEscape]
end
end


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

raw_sh env_vars, Utilities.find_jruby, *jruby_args, *args
end
alias ruby run