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: ae6deed53151
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1a697d4fbdba
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 10, 2015

  1. [Truffle] JT: Use #run instead of repeating logic.

    @eregon
    eregon committed Jul 10, 2015
    Copy the full SHA
    33b0d9d View commit details

  2. [Truffle] JT: Merge #mspec_env an #mspec.

    @eregon
    eregon committed Jul 10, 2015
    Copy the full SHA
    1a697d4 View commit details
Showing with 9 additions and 11 deletions.
  1. +9 −11 tool/jt.rb
20 changes: 9 additions & 11 deletions tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -155,11 +155,11 @@ def mvn(*args)

def mspec(command, *args)
env_vars = {}
mspec_env env_vars, command, *args
end

def mspec_env(env, command, *args)
sh env, 'ruby', 'spec/mspec/bin/mspec', command, '--config', 'spec/truffle/truffle.mspec', *args
if command.is_a?(Hash)
env_vars = command
command, *args = args
end
sh env_vars, 'ruby', 'spec/mspec/bin/mspec', command, '--config', 'spec/truffle/truffle.mspec', *args
end
end

@@ -227,9 +227,7 @@ def clean
end

def irb(*args)
env_vars = {}
jruby_args = %w[-X+T -S irb]
raw_sh(env_vars, "#{JRUBY_DIR}/bin/jruby", *jruby_args, *args)
run(*%w[-S irb], *args)
end

def rebuild
@@ -292,14 +290,14 @@ def test_mri(*args)
env_vars = {
"EXCLUDES" => "test/mri/excludes_truffle"
}
jruby_args = %w[-J-Xmx2G -X+T -Xtruffle.exceptions.print_java]
jruby_args = %w[-J-Xmx2G -Xtruffle.exceptions.print_java]

if args.empty?
args = File.readlines("#{JRUBY_DIR}/test/mri_truffle.index").grep(/^[^#]\w+/).map(&:chomp)
end

command = %w[test/mri/runner.rb -v --color=never --tty=no -q]
raw_sh(env_vars, "#{JRUBY_DIR}/bin/jruby", *jruby_args, *command, *args)
run(env_vars, *jruby_args, *command, *args)
end
private :test_mri

@@ -350,7 +348,7 @@ def test_specs(*args)
options << "-T#{JEXCEPTION}"
end

mspec_env env_vars, 'run', *options, *args
mspec env_vars, 'run', *options, *args
end
private :test_specs