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

Commits on Jun 26, 2015

  1. [Truffle] JT: Add a way to run the ambiguous optional args checker.

    @eregon
    eregon committed Jun 26, 2015
    Copy the full SHA
    e482d15 View commit details

  2. [Truffle] Run check_ambiguous_arguments on Travis

    @eregon
    eregon committed Jun 26, 2015
    Copy the full SHA
    53bf206 View commit details
Showing with 19 additions and 1 deletion.
  1. +2 −0 .travis.yml
  2. +17 −1 tool/jt.rb
2 changes: 2 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -70,6 +70,8 @@ matrix:
jdk: oraclejdk8
- env: COMMAND=tool/truffle-findbugs.sh
jdk: oraclejdk8
- env: COMMAND=ruby tool/jt.rb check_ambiguous_arguments
jdk: oraclejdk8
- env: COMMAND=test/truffle/run.sh
jdk: oraclejdk8
fast_finish: true
18 changes: 17 additions & 1 deletion tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -227,7 +227,7 @@ def rebuild
end

def run(*args)
env_vars = {}
env_vars = args.first.is_a?(Hash) ? args.shift : {}
jruby_args = %w[-X+T]

{ '--asm' => '--graal', '--igv' => '--graal' }.each_pair do |arg, dep|
@@ -402,6 +402,22 @@ def findbugs(report=nil)
end
end

def check_ambiguous_arguments
pom = "#{JRUBY_DIR}/truffle/pom.rb"
contents = File.read(pom)
contents.gsub!(/^(\s+)'source'\s*=>.+'1.7'.+,\n\s+'target'\s*=>.+\s*'1.7.+,\n/) do
indent = $1
$&.gsub("1.7", "1.8") + "#{indent}'fork' => 'true',\n"
end
contents.sub!(/^(\s+)('-J-Dfile.encoding=UTF-8')(.+\n)/) do
"#{$1}#{$2},\n#{$1}'-parameters'#{$3}"
end
File.write pom, contents
FileUtils::Verbose.rm_r "#{JRUBY_DIR}/truffle/target/classes"
build('truffle')
run({ "TRUFFLE_CHECK_AMBIGUOUS_OPTIONAL_ARGS" => "true" }, '-e', 'exit')
end

def install(arg)
case arg
when /.*suite.*\.py$/