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

Commits on May 4, 2016

  1. Copy the full SHA
    67e85cf View commit details
  2. Copy the full SHA
    d1763e1 View commit details
  3. Copy the full SHA
    ccb9bb5 View commit details
  4. Copy the full SHA
    108f399 View commit details
  5. Copy the full SHA
    c7de4bb View commit details
4 changes: 2 additions & 2 deletions lib/ruby/truffle/jruby+truffle/bin/jruby+truffle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby

require_relative '../lib/runner.rb'
require_relative '../lib/truffle/runner.rb'

runner = JRubyTruffleRunner.new ARGV
runner = Truffle::Runner.new ARGV
exit runner.run
23 changes: 2 additions & 21 deletions lib/ruby/truffle/jruby+truffle/gem_configurations/activemodel.yaml
Original file line number Diff line number Diff line change
@@ -136,27 +136,7 @@
:test_validates_presence_of_finds_global_default_key_translation_when_blank],
NumericalityValidationTest: [:test_validates_numericality_with_equal_to] }
undefine = if ENV['CI']
failures
else
{}
end
undefine.each do |mod_name, tests|
unless Object.const_defined? mod_name
warn "#{mod_name} not found"
next
end
mod = Object.const_get mod_name
Array(tests).each do |test|
begin
puts "Undefining: #{mod}##{test}"
mod.send :undef_method, test
rescue NoMethodError => e
p e
end
end
end
Truffle.exclude_rspec_examples failures
# do not let bundler to install db gem group
:without:
@@ -166,5 +146,6 @@
- rubygems
- shims
- openssl-stubs
- truffle/exclude_rspec_examples
:environment:
N: 1
Original file line number Diff line number Diff line change
@@ -60,27 +60,7 @@
TimeZoneTest: :test_map_srednekolymsk_to_tzinfo }
undefine = if ENV['CI']
failures
else
{}
end
undefine.each do |mod_name, tests|
unless Object.const_defined? mod_name
warn "#{mod_name} not found"
next
end
mod = Object.const_get mod_name
Array(tests).each do |test|
begin
puts "Undefining: #{mod}##{test}"
mod.send :undef_method, test
rescue NoMethodError => e
p e
end
end
end
Truffle.exclude_rspec_examples failures
# do not let bundler to install db gem group
:without:
@@ -93,5 +73,6 @@
- bigdecimal
- pathname
- openssl-stubs
- truffle/exclude_rspec_examples
:environment:
N: 1
716 changes: 0 additions & 716 deletions lib/ruby/truffle/jruby+truffle/lib/runner.rb

This file was deleted.

720 changes: 720 additions & 0 deletions lib/ruby/truffle/jruby+truffle/lib/truffle/runner.rb

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions test/truffle/integration/rails-app.sh
Original file line number Diff line number Diff line change
@@ -14,6 +14,12 @@ then

else

if [ -f tmp/pids/server.pid ]
then
kill $(cat tmp/pids/server.pid) || true
rm tmp/pids/server.pid
fi

$JRUBY $JRUBY_BIN/gem install bundler

$JTR setup
@@ -23,8 +29,8 @@ else

while ! curl -s "$url/people.json";
do
echo -n .
sleep 1
echo -n .
sleep 1
done

echo Server is up
2 changes: 1 addition & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
@@ -472,7 +472,7 @@ def test(*args)
test_tck
test_specs('run')
# test_mri # TODO (pitr-ch 29-Mar-2016): temporarily disabled
test_integration({'CI' => 'true', 'HAS_REDIS' => 'true'}, 'all')
test_integration({'HAS_REDIS' => 'true'}, 'all')
test_compiler
test_cexts if ENV['SULONG_DIR']
when 'compiler' then test_compiler(*rest)