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

Commits on Jul 3, 2016

  1. Copy the full SHA
    ca8a517 View commit details
  2. Copy the full SHA
    d60fdfe View commit details
  3. Copy the full SHA
    5b20644 View commit details
  4. Copy the full SHA
    08a225f View commit details
  5. Copy the full SHA
    af91cfe View commit details
  6. Copy the full SHA
    7eaee54 View commit details
20 changes: 0 additions & 20 deletions lib/ruby/truffle/jruby+truffle/gem_ci/actionpack.rb

This file was deleted.

12 changes: 0 additions & 12 deletions lib/ruby/truffle/jruby+truffle/gem_ci/activemodel.rb

This file was deleted.

12 changes: 0 additions & 12 deletions lib/ruby/truffle/jruby+truffle/gem_ci/activesupport.rb

This file was deleted.

7 changes: 0 additions & 7 deletions lib/ruby/truffle/jruby+truffle/gem_ci/algebrick.rb

This file was deleted.

13 changes: 0 additions & 13 deletions lib/ruby/truffle/jruby+truffle/gem_ci/default.rb

This file was deleted.

132 changes: 90 additions & 42 deletions lib/ruby/truffle/jruby+truffle/lib/truffle/config.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
require 'pp'
require 'yaml'

include Truffle::Runner::ConfigUtils
include Truffle::Runner::OptionBlocks

stubs = {
# TODO (pitr-ch 23-Jun-2016): remove? it's not used any more
minitest: dedent(<<-RUBY),
@@ -157,54 +160,99 @@ def exclusion_file(gem_name)
run: { environment: { 'N' => 1 },
require: %w(rubygems date bigdecimal pathname openssl-stubs) }

config :activesupport,
deep_merge(
rails_common,
stubs.fetch(:activesupport_isolation),
replacements.fetch(:method_source))
Truffle::Runner.add_config :activesupport,
deep_merge(
rails_common,
stubs.fetch(:activesupport_isolation),
replacements.fetch(:method_source))

config :activemodel,
deep_merge(
rails_common,
stubs.fetch(:activesupport_isolation),
stubs.fetch(:bcrypt))
Truffle::Runner.add_config :activemodel,
deep_merge(
rails_common,
stubs.fetch(:activesupport_isolation),
stubs.fetch(:bcrypt))

# TODO (pitr-ch 23-Jun-2016): investigate, fails intermittently
config :actionpack,
deep_merge(
rails_common,
stubs.fetch(:html_sanitizer),
setup: { file: { 'excluded-tests.rb' => format(dedent(<<-RUBY), exclusion_file(:actionpack)),
Truffle::Runner.add_config :actionpack,
deep_merge(
rails_common,
stubs.fetch(:html_sanitizer),
setup: { file: { 'excluded-tests.rb' => format(dedent(<<-RUBY), exclusion_file(:actionpack)),
failures = %s
require 'truffle/exclude_rspec_examples'
Truffle.exclude_rspec_examples failures
RUBY
} })

config :'concurrent-ruby',
setup: { file: { "stub-processor_number.rb" => dedent(<<-RUBY) } },
# stub methods calling #system
require 'concurrent'
module Concurrent
module Utility
class ProcessorCounter
def compute_processor_count
2
end
def compute_physical_processor_count
2
end
end
end
end
RUBY
run: { require: %w(stub-processor_number) }
RUBY
} })

Truffle::Runner.add_config :'concurrent-ruby',
setup: { file: { "stub-processor_number.rb" => dedent(<<-RUBY) } },
# stub methods calling #system
require 'concurrent'
module Concurrent
module Utility
class ProcessorCounter
def compute_processor_count
2
end
def compute_physical_processor_count
2
end
end
end
end
RUBY
run: { require: %w(stub-processor_number) }

Truffle::Runner.add_config :monkey_patch,
replacements.fetch(:bundler)

Truffle::Runner.add_config :openweather,
replacements.fetch(:'bundler/gem_tasks')

Truffle::Runner.add_config :psd,
replacements.fetch(:nokogiri)


class Truffle::Runner::CIEnvironment
def rails_ci(exclude)
repository_name 'rails'

config :monkey_patch,
replacements.fetch(:bundler)
git_clone 'https://github.com/rails/rails.git' unless File.exists? repository_dir
git_checkout git_tag('4.2.6')

config :openweather,
replacements.fetch(:'bundler/gem_tasks')
use_only_https_git_paths!

config :psd,
replacements.fetch(:nokogiri)
has_to_succeed setup
set_result run([%w[--require-pattern test/**/*_test.rb],
(exclude ? %w[-r excluded-tests] : []),
%w[-- -I test -e nil]].flatten(1))
end
end

Truffle::Runner.add_ci_definition :actionpack do
declare_options exclude: ['--[no-]exclude',
'Exclude known failing tests',
STORE_NEW_VALUE,
true]
subdir 'actionpack'
rails_ci option(:exclude)
end

Truffle::Runner.add_ci_definition :activemodel do
subdir 'activemodel'
rails_ci false
end

Truffle::Runner.add_ci_definition :activesupport do
subdir 'activesupport'
rails_ci false
end

Truffle::Runner.add_ci_definition :algebrick do
git_clone 'https://github.com/pitr-ch/algebrick.git' unless File.exists? repository_dir
git_checkout git_tag '0.7.3'

has_to_succeed setup

set_result run(%w[test/algebrick_test.rb])
end
Loading