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

Commits on Feb 15, 2016

  1. [Truffle] New attachment spec that attachments are only run once.

    @chrisseaton
    chrisseaton committed Feb 15, 2016
    Copy the full SHA
    f7e243b View commit details

  2. [Truffle] Update Truffle version.

    @chrisseaton
    chrisseaton committed Feb 15, 2016
    Copy the full SHA
    017ae81 View commit details

  3. Merge branch 'master' into truffle-head

    @chrisseaton
    chrisseaton committed Feb 15, 2016
    Copy the full SHA
    8850f5d View commit details
Showing with 16 additions and 5 deletions.
  1. +11 −0 spec/truffle/specs/truffle/attachments/attach_spec.rb
  2. +1 −1 truffle/pom.rb
  3. +4 −4 truffle/pom.xml
11 changes: 11 additions & 0 deletions spec/truffle/specs/truffle/attachments/attach_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -35,6 +35,17 @@ def fixture
fixture.should == 14
scratch[0].should be_true
end

it "only runs the block once each time the line is executed" do
scratch = []

@attachments << Truffle::Attachments.attach(__FILE__, 14) do
scratch << :run
end

fixture.should == 14
scratch.size.should == 1
end

it "allows multiple blocks to be installed on the same line and runs both of them" do
scratch = []
2 changes: 1 addition & 1 deletion truffle/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
:id => 'truffle' )

truffle_version = 'aa58a258b10c344b8f3abca6a18911435a6f92fc-SNAPSHOT'
truffle_version = '385095c3a988e6b16fbcdeb8dc8d55150cfbbefd-SNAPSHOT'
jar 'com.oracle.truffle:truffle-api:' + truffle_version
jar 'com.oracle.truffle:truffle-debug:' + truffle_version
jar 'com.oracle.truffle:truffle-dsl-processor:' + truffle_version, :scope => 'provided'
8 changes: 4 additions & 4 deletions truffle/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -41,23 +41,23 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-api</artifactId>
<version>aa58a258b10c344b8f3abca6a18911435a6f92fc-SNAPSHOT</version>
<version>385095c3a988e6b16fbcdeb8dc8d55150cfbbefd-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-debug</artifactId>
<version>aa58a258b10c344b8f3abca6a18911435a6f92fc-SNAPSHOT</version>
<version>385095c3a988e6b16fbcdeb8dc8d55150cfbbefd-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-dsl-processor</artifactId>
<version>aa58a258b10c344b8f3abca6a18911435a6f92fc-SNAPSHOT</version>
<version>385095c3a988e6b16fbcdeb8dc8d55150cfbbefd-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-tck</artifactId>
<version>aa58a258b10c344b8f3abca6a18911435a6f92fc-SNAPSHOT</version>
<version>385095c3a988e6b16fbcdeb8dc8d55150cfbbefd-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>