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

Commits on Feb 23, 2016

  1. [Truffle] Make jruby_eclipse detection lazy and fix check_ambiguous_a… 

    …rguments
    @eregon
    eregon committed Feb 23, 2016
    Copy the full SHA
    8809e71 View commit details

  2. [Truffle] Re-enable jt check_ambiguous_arguments.

    @eregon
    eregon committed Feb 23, 2016
    2
    Copy the full SHA
    9a13953 View commit details
Showing with 13 additions and 9 deletions.
  1. +2 −2 .travis.yml
  2. +11 −7 tool/jt.rb
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -74,10 +74,10 @@ matrix:
jdk: oraclejdk8
- env: COMMAND=test/check_versions.sh
jdk: oraclejdk8
allow_failures:
- env: PHASE='-Prake -Dtask=test:mri:fullint'
- env: JT=check_ambiguous_arguments
jdk: oraclejdk8
allow_failures:
- env: PHASE='-Prake -Dtask=test:mri:fullint'
# NOTE: build seems to never start (waited for any to finish for more than a day) - probably a travis-ci bug
#- env: PHASE='-Pmain'
# sudo: required
18 changes: 11 additions & 7 deletions tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -59,8 +59,13 @@ def self.find_graal_js
raise "couldn't find trufflejs.jar - download GraalVM as described in https://github.com/jruby/jruby/wiki/Downloading-GraalVM and find it in there"
end

def self.jruby_eclipse?
# tool/jruby_eclipse only works on release currently
ENV["JRUBY_ECLIPSE"] == "true" && Utilities.git_branch == "master"
end

def self.find_jruby
if USE_JRUBY_ECLIPSE
if jruby_eclipse?
"#{JRUBY_DIR}/tool/jruby_eclipse"
elsif ENV['RUBY_BIN']
ENV['RUBY_BIN']
@@ -211,7 +216,7 @@ def mspec(command, *args)
command, *args = args
end

if USE_JRUBY_ECLIPSE
if Utilities.jruby_eclipse?
args.unshift "-ttool/jruby_eclipse"
end

@@ -739,6 +744,8 @@ def log(tty_message, full_message)

def check_ambiguous_arguments
ENV.delete "JRUBY_ECLIPSE" # never run from the Eclipse launcher here
clean
# modify pom
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
@@ -749,8 +756,8 @@ def check_ambiguous_arguments
"#{$1}#{$2},\n#{$1}'-parameters'#{$3}"
end
File.write pom, contents
FileUtils::Verbose.rm_r "#{JRUBY_DIR}/truffle/target/classes"
build('truffle')

build
run({ "TRUFFLE_CHECK_AMBIGUOUS_OPTIONAL_ARGS" => "true" }, '-e', 'exit')
end

@@ -825,7 +832,4 @@ def main(args)
end
end

# tool/jruby_eclipse only works on release currently
USE_JRUBY_ECLIPSE = ENV["JRUBY_ECLIPSE"] == "true" && Utilities.git_branch == "master"

JT.new.main(ARGV)