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

Commits on Apr 22, 2015

  1. Revert "Remove a couple working excludes."

    This reverts commit e7c7beb.
    headius committed Apr 22, 2015
    Copy the full SHA
    6dca372 View commit details
  2. Copy the full SHA
    a60bd1f View commit details
  3. Copy the full SHA
    f0579bc View commit details
Showing with 6 additions and 4 deletions.
  1. +3 −3 .travis.yml
  2. +1 −1 test/check_versions.sh
  3. +2 −0 test/mri/excludes/TestProcess.rb
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@ language: java

sudo: false

cache:
directories:
- $HOME/.m2
#cache:
# directories:
# - $HOME/.m2

before_script:
- unset GEM_PATH GEM_HOME IRBRC JRUBY_OPTS
2 changes: 1 addition & 1 deletion test/check_versions.sh
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ check maven/jruby-complete/target/jruby-complete-$jar_version.jar 27
check maven/jruby/target/jruby-$jar_version.jar 9
check maven/jruby-dist/target/jruby-dist-$jar_version-bin.tar.gz 45 jruby-$jar_version
check maven/jruby-dist/target/jruby-dist-$jar_version-bin200.tar.gz 17 jruby-$jar_version
check maven/jruby-dist/target/jruby-dist-$jar_version-src.zip 13 jruby-$jar_version
check maven/jruby-dist/target/jruby-dist-$jar_version-src.zip 14 jruby-$jar_version
check maven/jruby-dist/target/jruby-dist-$jar_version-bin.zip 45 jruby-$jar_version
check core/target/jruby-core-$jar_version.jar 9
check truffle/target/jruby-truffle-$jar_version.jar 15
2 changes: 2 additions & 0 deletions test/mri/excludes/TestProcess.rb
Original file line number Diff line number Diff line change
@@ -35,6 +35,8 @@
exclude :test_gid_re_exchangeable_p, "unimplemented"
exclude :test_gid_sid_available?, "unimplemented"
exclude :test_no_curdir, "out of memory error"
exclude :test_popen_cloexec, "unsupported"
exclude :test_popen_noshell, "fails on linux (Travis)"
exclude :test_popen_wordsplit, "needs investigation"
exclude :test_popen_wordsplit_beginning_and_trailing_spaces, "needs investigation"
exclude :test_process_detach, "uses fork"