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

Commits on Dec 23, 2015

  1. [Truffle] Upadte Graal instructions.

    @chrisseaton
    chrisseaton committed Dec 23, 2015
    Copy the full SHA
    c55eda9 View commit details

  2. [Truffle] Remove mvn -Ptruffle-test-pe

    @chrisseaton
    chrisseaton committed Dec 23, 2015
    Copy the full SHA
    b9d68b4 View commit details
Showing with 4 additions and 28 deletions.
  1. +0 −24 test/pom.rb
  2. +4 −4 tool/jt.rb
24 changes: 0 additions & 24 deletions test/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -301,30 +301,6 @@ def truffle_spec_config(spec_type, generate_report)

end

profile 'truffle-test-pe' do

# Don't run the unit tests.
properties :skipTests => 'true'

plugin :antrun do
execute_goals( 'run',
:id => 'rake',
:phase => 'test',
:configuration => [ xml(
'<target>' +
'<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">' +
'<arg value="-J-server" />' +
'<arg value="-X+T" />' +
'<arg value="-J-Djvmci.option.TruffleIterativePartialEscape=true" />' +
'<arg value="-J-Djvmci.option.TruffleCompilationExceptionsAreThrown=true" />' +
'<arg value="test/truffle/pe/pe.rb" />' +
'</exec>' +
'</target>' ) ] )
end

end


profile 'truffle-mri-tests' do

plugin :surefire, '2.15', :skipTests => true
8 changes: 4 additions & 4 deletions tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -38,13 +38,13 @@ def self.find_graal
graal_locations = [
ENV['GRAAL_BIN'],
ENV["GRAAL_BIN_#{mangle_for_env(git_branch)}"],
"graalvm-jdk1.8.0/bin/java",
"../graalvm-jdk1.8.0/bin/java",
"../../graalvm-jdk1.8.0/bin/java",
"GraalVM-0.9/jre/bin/javao",
"../GraalVM-0.9/jre/bin/javao",
"../../GraalVM-0.9/jre/bin/javao",
].compact.map { |path| File.expand_path(path, JRUBY_DIR) }

not_found = -> {
raise "couldn't find graal - download it from http://lafo.ssw.uni-linz.ac.at/graalvm/ and extract it into the JRuby repository or parent directory"
raise "couldn't find graal - download it as described in https://github.com/jruby/jruby/wiki/Downloading-GraalVM and extract it into the JRuby repository or parent directory"
}

graal_locations.find(not_found) do |location|