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

Commits on Apr 7, 2016

  1. [no ci] spelling error

    enebo committed Apr 7, 2016
    Copy the full SHA
    419bf8b View commit details
  2. tagging fun

    enebo committed Apr 7, 2016
    Copy the full SHA
    7047e19 View commit details
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyFile.java
Original file line number Diff line number Diff line change
@@ -695,7 +695,7 @@ private static String stripTrailingSlashes(String path, int minPathLength) {
return path;
}
/**
* Return the dirname of the speficied filename. path is the original string. On windows
* Return the dirname of the specified filename. path is the original string. On windows
* if this is a file path it will leave the delimiter the same. If it represents a URI then it
* needs to become forward slashes.
*
1 change: 1 addition & 0 deletions test/externals/ruby1.9/excludes/TestClass.rb
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
exclude :test_invalid_jump_from_class_definition, "needs investigation"
exclude :test_method_redefinition, "needs investigation"
exclude :test_module_function, "needs investigation"
exclude :test_nonascii_name, "fails windows"
exclude :test_nested_class_removal, "needs investigation"
exclude :test_redefine_private_class, "needs investigation"
exclude :test_singleton_class, "needs investigation"
1 change: 1 addition & 0 deletions test/externals/ruby1.9/excludes/TestEncodingConverter.rb
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@
exclude :test_exc_invalid, "needs investigation"
exclude :test_exc_undef, "needs investigation"
exclude :test_finish_incomplete_error, "needs investigation"
exclude :test_get_replacement, "fails windows"
exclude :test_invalid, "needs investigation"
exclude :test_invalid2, "needs investigation"
exclude :test_invalid3, "needs investigation"
1 change: 1 addition & 0 deletions test/externals/ruby1.9/excludes/TestFile.rb
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
exclude :test_getc_extended_file , "needs investigation"
exclude :test_gets_extended_file , "needs investigation"
exclude :test_gets_para_extended_file , "needs investigation"
exclude :test_chmod_m17n, "needs investigation" if windows
exclude :test_read_all_extended_file , "needs investigation"
exclude :test_realdirpath , "needs investigation"
exclude :test_realpath , "needs investigation"
1 change: 1 addition & 0 deletions test/externals/ruby1.9/excludes/TestMarshal.rb
Original file line number Diff line number Diff line change
@@ -10,3 +10,4 @@
exclude :test_marshal_complex, "needs investigation"
exclude :test_marshal_rational, "needs investigation"
exclude :test_marshal_load_should_not_taint_classes, "needs investigation"
exclude :test_too_long_string, "needs investigation (windows)"
1 change: 1 addition & 0 deletions test/externals/ruby1.9/excludes/TestModule.rb
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
exclude :test_include_under_safe4, "needs investigation"
exclude :test_method_added, "needs investigation"
exclude :test_method_redefinition, "needs investigation"
exclude :test_nonascii_name, "needs investigation"
exclude :test_toplevel_private_constant, "fails to launch external JRuby instance"
exclude :test_private_constants_clear_inlinecache, "fails to launch external JRuby instance"
exclude :test_protected_singleton_method, "needs investigation"
5 changes: 0 additions & 5 deletions test/externals/ruby1.9/excludes/TestSocket.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
windows = RbConfig::CONFIG['host_os'] =~ /mswin|mingw/

exclude :test_accept_loop, "needs investigation"
exclude :test_accept_loop_multi_port, "needs investigation"
exclude :test_accept_loop_with_unix, "needs investigation" if !windows
exclude :test_closed_read, "needs investigation"
exclude :test_getaddrinfo, "needs investigation"
exclude :test_getaddrinfo_raises_no_errors_on_port_argument_of_0, "needs investigation"
@@ -16,8 +13,6 @@
exclude :test_tcp_server_sockets, "needs investigation"
exclude :test_tcp_server_sockets_port0, "needs investigation"
exclude :test_udp_server, "needs investigation"
exclude :test_unix, "needs investigation" if !windows
exclude :test_unix_server_socket, "needs investigation" if !windows
exclude :test_unpack_sockaddr, "needs investigation"


5 changes: 0 additions & 5 deletions test/externals/ruby1.9/excludes/TestSocket_UNIXSocket.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
windows = RbConfig::CONFIG['host_os'] =~ /mswin|mingw/

exclude :text_accept_unix, "no support" if !windows
exclude :test_addr, "needs investigation"
exclude :test_dgram_pair, "needs investigation"
exclude :test_epipe, "needs investigation"
@@ -12,5 +9,3 @@
exclude :test_nul, "needs investigation"
exclude :test_socket_pair_with_block, "needs investigation"
exclude :test_too_long_path, "needs investigation"
exclude :test_unix_server_socket, "no support" if !windows
exclude :test_unix_socket_pair_with_block, "no support" if !windows