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

Commits on Apr 11, 2016

  1. [Truffle] jt test: exlude known failing tests to prevent early exit 

    (which makes it easy to run all avaliable tests locally with one command)
    @pitr-ch
    pitr-ch committed Apr 11, 2016
    Copy the full SHA
    02bff4b View commit details

  2. [Truffle] remove mistakenly committed .ruby-version

    @pitr-ch
    pitr-ch committed Apr 11, 2016
    Copy the full SHA
    f79afda View commit details
Showing with 4 additions and 6 deletions.
  1. +0 −1 test/truffle/integration/rails/.ruby-version
  2. +4 −5 tool/jt.rb
1 change: 0 additions & 1 deletion test/truffle/integration/rails/.ruby-version
View file

This file was deleted.

9 changes: 4 additions & 5 deletions tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -410,10 +410,10 @@ def test(*args)
test_tck
test_specs('run')
# test_mri # TODO (pitr-ch 29-Mar-2016): temporarily disabled
test_integration('all')
test_integration({'CI' => true, 'HAS_REDIS' => true}, 'all')
test_compiler
when 'compiler' then test_compiler(*rest)
when 'integration' then test_integration(*rest)
when 'integration' then test_integration({}, *rest)
when 'specs' then test_specs('run', *rest)
when 'tck' then
args = []
@@ -457,16 +457,15 @@ def test_compiler(*args)
end
private :test_compiler

def test_integration(*args)
def test_integration(env, *args)
no_gems = args.delete('--no-gems')

all = args.delete('all')
long = args.delete('long') || all
fast = args.delete('fast') || all ||
!long # fast is the default

env_vars = {}

env_vars = env
jruby_opts = []

jruby_opts << '-Xtruffle.graal.warn_unless=false'