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

Commits on Feb 25, 2016

  1. Revert part of tmpdir change to reduce path expansion. 

    See https://bugs.ruby-lang.org/issues/7547

See #3698.
    @headius
    headius committed Feb 25, 2016
    Copy the full SHA
    dfc5434 View commit details

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

    This reverts commit bff00fa.
    @headius
    headius committed Feb 25, 2016
    Copy the full SHA
    d9dc5f2 View commit details
Showing with 25 additions and 24 deletions.
  1. +3 −1 lib/ruby/stdlib/tmpdir.rb
  2. +22 −23 maven/jruby-complete/src/it/integrity/pom.xml
4 changes: 3 additions & 1 deletion lib/ruby/stdlib/tmpdir.rb
View file
Original file line number Diff line number Diff line change
@@ -140,7 +140,9 @@ def create(basename, tmpdir=nil, max_try: nil, **opts)
end
n = nil
begin
path = File.join(tmpdir, make_tmpname(basename, n))
# We use the second form here because chdir + ./ files won't open right (http://bugs.jruby.org/3698)
# path = File.join(tmpdir, make_tmpname(basename, n))
path = File.expand_path(make_tmpname(basename, n), tmpdir)
yield(path, n, opts)
rescue Errno::EEXIST
n ||= 0
45 changes: 22 additions & 23 deletions maven/jruby-complete/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -172,29 +172,28 @@
</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>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>
<execution>
<id>-S me - GH-3233</id>
<phase>test</phase>