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

Commits on Sep 28, 2016

  1. [Truffle] Update Truffle.

    chrisseaton committed Sep 28, 2016
    2
    Copy the full SHA
    4b5ec26 View commit details
  2. Copy the full SHA
    1b19ba4 View commit details
Showing with 29 additions and 14 deletions.
  1. +3 −3 ci.hocon
  2. +2 −2 mx.jruby/suite.py
  3. +11 −5 tool/jt.rb
  4. +6 −3 truffle/pom.rb
  5. +7 −1 truffle/pom.xml
6 changes: 3 additions & 3 deletions ci.hocon
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Must be the same as in truffle/pom.rb and mx.jruby/suite.py
truffle-version: 60fde6f5778d478411632077154bea1679839780
// Must be the same as in truffle/pom.rb and mx.jruby/suite.py (except for the -SNAPSHOT part only in pom.rb)
truffle-version: b2e70099cca564d81b2a9a6560fc6ad7fc815087

jt: [ruby, tool/jt.rb]

@@ -346,7 +346,7 @@ test-cexts: ${sulong} ${gem-test-pack} {

run: [
${jt} [test, specs, --graal, ":capi"],
${jt} [test, cexts]
${jt} [test, cexts, --no-argon2]
]
}

4 changes: 2 additions & 2 deletions mx.jruby/suite.py
Original file line number Diff line number Diff line change
@@ -30,8 +30,8 @@ def mavenLib(mavenDep, sha1):
"suites": [
{
"name": "truffle",
# Must be the same as in truffle/pom.rb and ci.hocon
"version": "60fde6f5778d478411632077154bea1679839780",
# Must be the same as in truffle/pom.rb and ci.hocon (except for the -SNAPSHOT part only in pom.rb)
"version": "b2e70099cca564d81b2a9a6560fc6ad7fc815087",
"urls": [
{"url": "https://github.com/graalvm/truffle.git", "kind": "git"},
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
16 changes: 11 additions & 5 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -462,7 +462,7 @@ def help
jt test gems tests using gems
jt test ecosystem [--offline] tests using the wider ecosystem such as bundler, Rails, etc
(when --offline it will not use rubygems.org)
jt test cexts [--no-libxml --no-openssl] run C extension tests
jt test cexts [--no-libxml --no-openssl --no-argon2] run C extension tests
(implies --graal, where Graal needs to include Sulong, set SULONG_HOME to a built checkout of Sulong, and set GEM_HOME)
jt test report :language build a report on language specs
:core (results go into test/target/mspec-html-report)
@@ -792,6 +792,7 @@ def test_compiler(*args)
def test_cexts(*args)
no_libxml = args.delete('--no-libxml')
no_openssl = args.delete('--no-openssl')
no_argon2 = args.delete('--no-argon2')

# Test that we can compile and run some basic C code that uses libxml and openssl

@@ -843,12 +844,17 @@ def test_cexts(*args)

# Test that we can compile and run some real C extensions

[
tests = [
['oily_png', ['chunky_png-1.3.6', 'oily_png-1.2.0'], ['oily_png']],
['psd_native', ['chunky_png-1.3.6', 'oily_png-1.2.0', 'bindata-2.3.1', 'hashie-3.4.4', 'psd-enginedata-1.1.1', 'psd-2.1.2', 'psd_native-1.1.3'], ['oily_png', 'psd_native']],
['nokogiri', [], ['nokogiri']],
['ruby-argon2', [], [], "#{ENV['GEM_HOME']}/bundler/gems/ruby-argon2-bd3fb1e056cf"]
].each do |gem_name, dependencies, libs, gem_root|
['nokogiri', [], ['nokogiri']]
]

unless no_argon2
tests.push ['ruby-argon2', [], [], "#{ENV['GEM_HOME']}/bundler/gems/ruby-argon2-bd3fb1e056cf"]
end

tests.each do |gem_name, dependencies, libs, gem_root|
next if gem_name == 'nokogiri' # nokogiri totally excluded
next if gem_name == 'nokogiri' && no_libxml
unless gem_root and File.exist?(File.join(gem_root, CEXTC_CONF_FILE))
9 changes: 6 additions & 3 deletions truffle/pom.rb
Original file line number Diff line number Diff line change
@@ -9,16 +9,19 @@

properties( 'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
# Must be the same as in mx.jruby/suite.py and ci.hocon
'truffle.version' => '0.17',
# Must be the same as in mx.jruby/suite.py and ci.hocon (except for the -SNAPSHOT part only in this file)
'truffle.version' => 'b2e70099cca564d81b2a9a6560fc6ad7fc815087-SNAPSHOT',
'jruby.basedir' => '${basedir}/..',
'maven.test.skip' => 'true' )

jar 'org.yaml:snakeyaml:1.14'
jar 'org.antlr:antlr4-runtime:4.5.1-1'

jar 'org.jruby:jruby-core', '${project.version}', :scope => 'provided'


repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
:id => 'truffle' )

truffle_version = '${truffle.version}'
jar 'com.oracle.truffle:truffle-api:' + truffle_version
jar 'com.oracle.truffle:truffle-debug:' + truffle_version
8 changes: 7 additions & 1 deletion truffle/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.basedir>${basedir}/..</jruby.basedir>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<truffle.version>0.17</truffle.version>
<truffle.version>b2e70099cca564d81b2a9a6560fc6ad7fc815087-SNAPSHOT</truffle.version>
</properties>
<dependencies>
<dependency>
@@ -68,6 +68,12 @@ DO NOT MODIFIY - GENERATED CODE
<scope>test</scope>
</dependency>
</dependencies>
<repositories>
<repository>
<id>truffle</id>
<url>http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
<build>
<defaultGoal>package</defaultGoal>
<resources>