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: c38758f90f21
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d434ae50c8a2
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 26, 2015

  1. [Truffle] Add MRI tests to Travis builds and update the jt tool.

    @bjfish
    bjfish committed Apr 26, 2015
    Copy the full SHA
    3e6a636 View commit details

Commits on Apr 28, 2015

  1. Merge pull request #2870 from bjfish/truffle_mri_travis 

    [Truffle] Add MRI tests to Travis builds and update the jt tool.
    @chrisseaton
    chrisseaton committed Apr 28, 2015
    Copy the full SHA
    d434ae5 View commit details
Showing with 50 additions and 30 deletions.
  1. +1 −0 .travis.yml
  2. +1 −0 test/mri/excludes_truffle/TestBasicInstructions.rb
  3. +48 −30 tool/jt.rb
1 change: 1 addition & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@ env:
- PHASE='-Ptruffle-specs-language'
- PHASE='-Ptruffle-specs-core'
- PHASE='-Ptruffle-specs-library'
- PHASE='-Ptruffle-mri-tests'

matrix:
include:
1 change: 1 addition & 0 deletions test/mri/excludes_truffle/TestBasicInstructions.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
exclude :test_opassign1_2, "needs investigation"
exclude :test_opassign2_2, "needs investigation"
exclude :test_opassign2_3, "needs investigation"
exclude :test_xstr, "needs investigation"
78 changes: 48 additions & 30 deletions tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -140,42 +140,43 @@ module Commands
include ShellUtils

def help
puts 'jt build build'
puts 'jt build truffle build only the Truffle part, assumes the rest is up-to-date'
puts 'jt clean clean'
puts 'jt irb irb'
puts 'jt rebuild clean and build'
puts 'jt run [options] args... run JRuby with -X+T and args'
puts 'jt build build'
puts 'jt build truffle build only the Truffle part, assumes the rest is up-to-date'
puts 'jt clean clean'
puts 'jt irb irb'
puts 'jt rebuild clean and build'
puts 'jt run [options] args... run JRuby with -X+T and args'
puts ' --graal use Graal (set GRAAL_BIN or it will try to automagically find it)'
puts ' --asm show assembly (implies --graal)'
puts ' --server run an instrumentation server on port 8080'
puts ' --igv make sure IGV is running and dump Graal graphs after partial escape (implies --graal)'
puts 'jt test mri run mri tests'
puts 'jt test run all specs'
puts 'jt test fast run all specs except sub-processes, GC, sleep, ...'
puts 'jt test spec/ruby/language run specs in this directory'
puts 'jt test spec/ruby/language/while_spec.rb run specs in this file'
puts 'jt test pe run partial evaluation tests'
puts 'jt tag spec/ruby/language tag failing specs in this directory'
puts 'jt tag spec/ruby/language/while_spec.rb tag failing specs in this file'
puts 'jt tag all spec/ruby/language tag all specs in this file, without running them'
puts 'jt untag spec/ruby/language untag passing specs in this directory'
puts 'jt untag spec/ruby/language/while_spec.rb untag passing specs in this file'
puts 'jt bench debug benchmark run a single benchmark with options for compiler debugging'
puts 'jt bench reference [benchmarks] run a set of benchmarks and record a reference point'
puts 'jt bench compare [benchmarks] run a set of benchmarks and compare against a reference point'
puts 'jt test run all mri tests and specs'
puts 'jt test mri run mri tests'
puts 'jt test specs run all specs'
puts 'jt test specs fast run all specs except sub-processes, GC, sleep, ...'
puts 'jt test spec/ruby/language run specs in this directory'
puts 'jt test spec/ruby/language/while_spec.rb run specs in this file'
puts 'jt test pe run partial evaluation tests'
puts 'jt tag spec/ruby/language tag failing specs in this directory'
puts 'jt tag spec/ruby/language/while_spec.rb tag failing specs in this file'
puts 'jt tag all spec/ruby/language tag all specs in this file, without running them'
puts 'jt untag spec/ruby/language untag passing specs in this directory'
puts 'jt untag spec/ruby/language/while_spec.rb untag passing specs in this file'
puts 'jt bench debug benchmark run a single benchmark with options for compiler debugging'
puts 'jt bench reference [benchmarks] run a set of benchmarks and record a reference point'
puts 'jt bench compare [benchmarks] run a set of benchmarks and compare against a reference point'
puts ' benchmarks can be any benchmarks of group of benchmarks supported'
puts ' by bench9000, eg all, classic, chunky, 3, 5, 10, 15 - default is 5'
puts 'jt findbugs run findbugs'
puts 'jt findbugs report run findbugs and generate an HTML report'
puts 'jt install ..../graal/mx/suite.py install a JRuby distribution into an mx suite'
puts 'jt findbugs run findbugs'
puts 'jt findbugs report run findbugs and generate an HTML report'
puts 'jt install ..../graal/mx/suite.py install a JRuby distribution into an mx suite'
puts
puts 'you can also put build or rebuild in front of any command'
puts
puts 'recognised environment variables:'
puts
puts ' GRAAL_BIN GraalVM executable (java command) to use'
puts ' GRAAL_BIN_...git_branch_name... GraalVM executable to use for a given branch'
puts ' GRAAL_BIN GraalVM executable (java command) to use'
puts ' GRAAL_BIN_...git_branch_name... GraalVM executable to use for a given branch'
puts ' branch names are mangled - eg truffle-head becomes GRAAL_BIN_TRUFFLE_HEAD'
end

@@ -254,25 +255,42 @@ def test_mri(*args)
args.unshift(*command)
raw_sh(env_vars, "#{JRUBY_DIR}/bin/jruby", *jruby_args, *args)
end
private :test_mri

def test(*args)
return test_pe(*args.drop(1)) if args.first == 'pe'

return test_mri(*args.drop(1)) if args.first == 'mri'

options = %w[--excl-tag fails]
if args.first == 'fast'
args.shift
options += %w[--excl-tag slow]
return test_specs(*args.drop(1)) if args.first == 'specs'

if args.size > 0
if args.first.start_with?('spec')
return test_specs(*args)
else
return test_mri(*args)
end
end
mspec 'run', *options, *args

test_specs(*args)
test_mri(*args)
end

def test_pe(*args)
run('--graal', *args, 'test/truffle/pe/pe.rb')
end
private :test_pe

def test_specs(*args)
options = %w[--excl-tag fails]
if args.first == 'fast'
args.shift
options += %w[--excl-tag slow]
end
mspec 'run', *options, *args
end
private :test_specs

def tag(path, *args)
return tag_all(*args) if path == 'all'
mspec 'tag', '--add', 'fails', '--fail', path, *args