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

Commits on Feb 24, 2016

  1. These are still instance variables.

    @headius
    headius committed Feb 24, 2016
    Copy the full SHA
    3721475 View commit details

  2. Disable this. thrift is a native gem. Don't know why we try it. 

    See #3141 and 917d0e7 for the bug that prompted this. It now fails
with a different reason, perhaps due to chdir being used during
extconf.
    @headius
    headius committed Feb 24, 2016
    Copy the full SHA
    bff00fa View commit details
Showing with 25 additions and 24 deletions.
  1. +2 −2 core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
  2. +23 −22 maven/jruby-complete/src/it/integrity/pom.xml
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
View file
Original file line number Diff line number Diff line change
@@ -1775,7 +1775,7 @@ public static RubyString newFrozenString(ThreadContext context, ByteList bytelis
if (runtime.getInstanceConfig().isDebuggingFrozenStringLiteral()) {
// stuff location info into the string and then freeze it
RubyArray info = (RubyArray) runtime.newArray(runtime.newString(file).freeze(context), runtime.newFixnum(line)).freeze(context);
string.setInternalVariable(RubyString.DEBUG_INFO_FIELD, info);
string.setInstanceVariable(RubyString.DEBUG_INFO_FIELD, info);
string.setFrozen(true);
} else {
string = runtime.freezeAndDedupString(string);
@@ -1790,7 +1790,7 @@ public static RubyString freezeLiteralString(ThreadContext context, RubyString s
if (runtime.getInstanceConfig().isDebuggingFrozenStringLiteral()) {
// stuff location info into the string and then freeze it
RubyArray info = (RubyArray) runtime.newArray(runtime.newString(file).freeze(context), runtime.newFixnum(line)).freeze(context);
string.setInternalVariable(RubyString.DEBUG_INFO_FIELD, info);
string.setInstanceVariable(RubyString.DEBUG_INFO_FIELD, info);
}

string.setFrozen(true);
45 changes: 23 additions & 22 deletions maven/jruby-complete/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -172,28 +172,29 @@
</arguments>
</configuration>
</execution>
<execution>
<id>gem install thrift -v0.9.2.0 - GH-3141</id>
<phase>test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<!-- automatically creates the classpath using all project dependencies,
also adding the project build directory -->
<classpath/>
<argument>org.jruby.Main</argument>
<argument>-S</argument>
<argument>gem</argument>
<argument>install</argument>
<argument>thrift</argument>
<argument>-v0.9.2.0</argument>
</arguments>
</configuration>
</execution>
<!-- commented out because I don't understand why we're trying to install a gem with a native ext anyway -->
<!--<execution>-->
<!--<id>gem install thrift -v0.9.2.0 - GH-3141</id>-->
<!--<phase>test</phase>-->
<!--<goals>-->
<!--<goal>exec</goal>-->
<!--</goals>-->
<!--<configuration>-->
<!--<executable>java</executable>-->
<!--<arguments>-->
<!--<argument>-classpath</argument>-->
<!--&lt;!&ndash; automatically creates the classpath using all project dependencies,-->
<!--also adding the project build directory &ndash;&gt;-->
<!--<classpath/>-->
<!--<argument>org.jruby.Main</argument>-->
<!--<argument>-S</argument>-->
<!--<argument>gem</argument>-->
<!--<argument>install</argument>-->
<!--<argument>thrift</argument>-->
<!--<argument>-v0.9.2.0</argument>-->
<!--</arguments>-->
<!--</configuration>-->
<!--</execution>-->
<execution>
<id>-S me - GH-3233</id>
<phase>test</phase>