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

Commits on Dec 17, 2014

  1. skip a test for embedded jruby

    @mkristian
    mkristian committed Dec 17, 2014
    Copy the full SHA
    f64b4fd View commit details

  2. make sure we get the ${basedir} right for the test

    @mkristian
    mkristian committed Dec 17, 2014
    Copy the full SHA
    1458327 View commit details

  3. remove those "bundle" is not a known protocol error

    @mkristian
    mkristian committed Dec 17, 2014
    Copy the full SHA
    5166c0d View commit details
2 changes: 1 addition & 1 deletion maven/jruby-jars/src/it/extended/src/test/java/org/example/SimpleTest.java
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@

public class SimpleTest {

private final String basedir = new File( "../../../../../" ).getAbsolutePath();
private final String basedir = new File( System.getProperty("basedir"), "../../../../../" ).getAbsolutePath();

private ScriptingContainer newScriptingContainer() {
ScriptingContainer container = new ScriptingContainer(LocalContextScope.SINGLETHREAD);
2 changes: 1 addition & 1 deletion maven/jruby/src/it/extended/src/test/java/org/example/SimpleTest.java
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@

public class SimpleTest {

private final String basedir = new File( "../../../../../" ).getAbsolutePath();
private final String basedir = new File( System.getProperty("basedir"), "../../../../../" ).getAbsolutePath();

private ScriptingContainer newScriptingContainer() {
ScriptingContainer container = new ScriptingContainer(LocalContextScope.SINGLETHREAD);
9 changes: 5 additions & 4 deletions spec/java_integration/rubygems/rubygems_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

require File.dirname(__FILE__) + "/../spec_helper"

require 'rubygems'
@@ -16,7 +17,7 @@
url_paths = ["file:/var/tmp",
"http://jruby.org",
"classpath:/META-INF/jruby.home",
"uri:bundle://13.0:1/META-INF/jruby.home",
"uri:jar:file://META-INF/jruby.home",
"jar:file:/var/tmp/some.jar!/some/path"]
Gem.use_paths(nil, url_paths)
Gem.path.should include(*url_paths)
@@ -29,8 +30,8 @@
File.exist?("classpath:/bogus/classpath").should be_false
Gem.ensure_gem_subdirectories("file:")
File.exist?("file:").should be_false
Gem.ensure_gem_subdirectories("uri:bundle://13.0:1/bogus/classpath")
File.exist?("uri:bundle://13.0:1").should be_false
File.exist?("uri:bundle://13.0:1/bogus/classpath").should be_false
Gem.ensure_gem_subdirectories("uri:file://bogus/classpath")
File.exist?("uri:file:///nothing").should be_false
File.exist?("uri:jar://bogus/classpath").should be_false
end
end
2 changes: 1 addition & 1 deletion test/test_command_line_switches.rb
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ class TestCommandLineSwitches < Test::Unit::TestCase
include TestHelper

# FIXME: currently fails on Windows
if (!WINDOWS)
if (!WINDOWS and not IS_JAR_EXECUTION)
def test_dash_0_splits_records
output = jruby_with_pipe("echo '1,2,3'", %Q{ -054 -n -e 'puts $_ + " "'})
assert_equal 0, $?.exitstatus