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

Commits on Nov 17, 2016

  1. Copy the full SHA
    40004fb View commit details
  2. Copy the full SHA
    fe40c4a View commit details
  3. Copy the full SHA
    d36ad78 View commit details

Large diffs are not rendered by default.

15 changes: 13 additions & 2 deletions lib/ruby/truffle/jruby-truffle-tool/lib/truffle/config.rb
Original file line number Diff line number Diff line change
@@ -243,9 +243,13 @@ def compute_physical_processor_count
Truffle::Tool.add_config :psd,
replacements.fetch(:nokogiri)

Truffle::Tool.add_config :actionview,
deep_merge(rails_common,
exclusions_for(:actionview),
stubs.fetch(:html_sanitizer))

class Truffle::Tool::CIEnvironment
def rails_ci(has_exclusions: false, skip_test_files: [])
def rails_ci(has_exclusions: false, skip_test_files: [], require_pattern: 'test/**/*_test.rb')
options = {}
options[:debug] = ['-d', '--[no-]debug', 'Run tests with remote debugging enabled.', STORE_NEW_VALUE, false]
options[:exclude] = ['--[no-]exclusion', 'Exclude known failing tests', STORE_NEW_VALUE, true] if has_exclusions
@@ -257,7 +261,7 @@ def rails_ci(has_exclusions: false, skip_test_files: [])

has_to_succeed setup
set_result run([*(['--exclude-pattern', *skip_test_files.join('|')] unless skip_test_files.empty?),
*%w[--require-pattern test/**/*_test.rb],
'--require-pattern', require_pattern,
*(%w[-r excluded-tests] if has_exclusions && option(:exclude)),
*(%w[--debug] if option(:debug)),
*%w[-- -I test -e nil]])
@@ -335,3 +339,10 @@ def rails_ci(has_exclusions: false, skip_test_files: [])

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

Truffle::Tool.add_ci_definition :actionview do
subdir 'actionview'
rails_ci has_exclusions: true,
require_pattern: 'test/template/**/*_test.rb'
# TODO (pitr-ch 17-Nov-2016): run "test/activerecord/*_test.rb" and "test/actionpack/**/*_test.rb" as well, has to be run separately
end
1 change: 1 addition & 0 deletions test/truffle/ecosystem/batch.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
- actionview
- actionpack
- activesupport
- activemodel
11 changes: 5 additions & 6 deletions tool/truffle/compare_stdlib.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
name = ARGV.first

# gem install path
require 'path'
require 'pathname'

org = Path("lib/ruby/stdlib/#{name}")
dst = Path("lib/ruby/truffle/mri/#{name}")
org = Pathname("lib/ruby/stdlib/#{name}")
dst = Pathname("lib/ruby/truffle/mri/#{name}")

a = org.glob("**/*.rb").map { |p| p % org }
b = dst.glob("**/*.rb").map { |p| p % dst }
a = Pathname.glob(org + '**/*.rb').map { |p| p.relative_path_from org }
b = Pathname.glob(dst + '**/*.rb').map { |p| p.relative_path_from dst }

puts "Extra files:"
puts b-a