ruby-changes:16300
From: yugui <ko1@a...>
Date: Fri, 11 Jun 2010 13:21:00 +0900 (JST)
Subject: [ruby-changes:16300] Ruby:r28272 (ruby_1_9_2): merges r28136 from trunk into ruby_1_9_2.
yugui 2010-06-11 13:20:45 +0900 (Fri, 11 Jun 2010) New Revision: 28272 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28272 Log: merges r28136 from trunk into ruby_1_9_2. -- * test/ruby/test_path.rb (test_path): workaround for drive letter. Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/test/ruby/test_path.rb Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 28271) +++ ruby_1_9_2/ChangeLog (revision 28272) @@ -223,8 +223,11 @@ * ext/dl/dl.h (DLSTACK_TYPE): type of stack is same as VALUE. reported by sakiyama shin in [ruby-dev:41514] -Thu Jun 3 06:25:14 2010 Nobuyoshi Nakada <nobu@r...> +Thu Jun 3 06:30:20 2010 Nobuyoshi Nakada <nobu@r...> + * test/ruby/test_path.rb (test_path): workaround for drive + letter. + * test/ruby/test_path.rb (test_path): get rid of blocking on access to non-existent host. Index: ruby_1_9_2/test/ruby/test_path.rb =================================================================== --- ruby_1_9_2/test/ruby/test_path.rb (revision 28271) +++ ruby_1_9_2/test/ruby/test_path.rb (revision 28272) @@ -43,7 +43,7 @@ assert_equal("//", File.expand_path(".", "//")) assert_equal("//sub", File.expand_path("sub", "//")) - assert_equal("/tmp/\u3042", File.expand_path("\u3042", "/tmp")) + assert_equal("//127.0.0.1/\u3042", File.expand_path("\u3042", "//127.0.0.1")) end def test_dirname -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/