From 3cc8da5f8ce924ff42d99d4f214f54748774166f Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 11 Jun 2010 04:20:45 +0000 Subject: merges r28136 from trunk into ruby_1_9_2. -- * test/ruby/test_path.rb (test_path): workaround for drive letter. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- test/ruby/test_path.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b20cedb5e..2f45eabb17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -223,7 +223,10 @@ Thu Jun 3 09:39:54 2010 NAKAMURA Usaku * 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 +Thu Jun 3 06:30:20 2010 Nobuyoshi Nakada + + * 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. diff --git a/test/ruby/test_path.rb b/test/ruby/test_path.rb index ad080fa444..31c1885371 100644 --- a/test/ruby/test_path.rb +++ b/test/ruby/test_path.rb @@ -43,7 +43,7 @@ class TestPath < Test::Unit::TestCase 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 -- cgit v1.2.3