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

Commits on Jun 11, 2015

  1. tag out some spawn failures in spec:ruby

    @enebo
    enebo committed Jun 11, 2015
    Copy the full SHA
    0e1ca0b View commit details

  2. Temporary commit (if works we need to push upstream to see if it pass… 

    …es on cloudbees) to replace getlogin with more ubiquitous id.
    @enebo
    enebo committed Jun 11, 2015
    Copy the full SHA
    ee9c643 View commit details

  3. Doh I changed this last night but forgot to commit. Bump version back… 

    … to -SNAPSHOT for dev cycle
    @enebo
    enebo committed Jun 11, 2015
    Copy the full SHA
    bbf3ee7 View commit details
Showing with 10 additions and 7 deletions.
  1. +1 −1 VERSION
  2. +1 −1 core/pom.xml
  3. +2 −2 lib/pom.xml
  4. +1 −1 pom.xml
  5. +1 −1 spec/ruby/library/etc/getlogin_spec.rb
  6. +2 −0 spec/tags/ruby/core/kernel/spawn_tags.txt
  7. +1 −0 spec/tags/ruby/core/process/spawn_tags.txt
  8. +1 −1 truffle/pom.xml
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.0.0.0.rc1
9.0.0.0-SNAPSHOT
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.0.0.rc1</version>
<version>9.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby-core</artifactId>
<name>JRuby Core</name>
4 changes: 2 additions & 2 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.0.0.rc1</version>
<version>9.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby-stdlib</artifactId>
<name>JRuby Lib Setup</name>
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>9.0.0.0.rc1</version>
<version>9.0.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
</parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.0.0.rc1</version>
<version>9.0.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JRuby</name>
<description>JRuby is the effort to recreate the Ruby (http://www.ruby-lang.org) interpreter in Java.</description>
2 changes: 1 addition & 1 deletion spec/ruby/library/etc/getlogin_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
if Etc.getlogin
# Etc.getlogin returns the same result of logname(2)
# if it returns non NULL
Etc.getlogin.should == `logname`.chomp
Etc.getlogin.should == `id -un`.chomp
else
# Etc.getlogin may return nil if the login name is not set
# because of chroot or sudo or something.
2 changes: 2 additions & 0 deletions spec/tags/ruby/core/kernel/spawn_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -51,3 +51,5 @@ fails:Kernel#spawn redirects STDOUT to the given file if :out => String
fails:Kernel#spawn redirects STDERR to the given file if :err => String
fails:Kernel#spawn when passed :close_others => false does not close file descriptors >= 3 in the child process if fds are set close_on_exec=false
fails:Kernel.spawn when passed :close_others => false does not close file descriptors >= 3 in the child process if fds are set close_on_exec=false
fails:Kernel#spawn when passed :close_others => false closes file descriptors >= 3 in the child process because they are set close_on_exec by default
fails:Kernel.spawn when passed :close_others => false closes file descriptors >= 3 in the child process because they are set close_on_exec by default
1 change: 1 addition & 0 deletions spec/tags/ruby/core/process/spawn_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -18,3 +18,4 @@ fails:Process.spawn joins the current process if :pgroup => false
fails:Process.spawn redirects STDOUT to the given file if :out => String
fails:Process.spawn redirects STDERR to the given file if :err => String
fails:Process.spawn when passed :close_others => false does not close file descriptors >= 3 in the child process if fds are set close_on_exec=false
fails:Process.spawn when passed :close_others => false closes file descriptors >= 3 in the child process because they are set close_on_exec by default
2 changes: 1 addition & 1 deletion truffle/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.0.0.rc1</version>
<version>9.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby-truffle</artifactId>
<name>JRuby Truffle</name>