diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-02 21:25:18 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-02 21:25:18 +0000 |
| commit | 90850320997cb0834b6960048b34da62f1668d67 (patch) | |
| tree | 36415ffee3375481578aed0d37d124e1b0ee588d | |
| parent | 67190ad100556e489e61349538cd7b51d78de414 (diff) | |
* test/ruby/test_path.rb (test_path): get rid of blocking on
access to non-existent host.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_path.rb | 4 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Thu Jun 3 06:25:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * test/ruby/test_path.rb (test_path): get rid of blocking on + access to non-existent host. + Tue Jun 1 23:22:59 2010 NARUSE, Yui <naruse@ruby-lang.org> * re.c (unescape_nonascii): \P{FOO} is also Unicode property in diff --git a/test/ruby/test_path.rb b/test/ruby/test_path.rb index f4b1baf91c..477bb7a287 100644 --- a/test/ruby/test_path.rb +++ b/test/ruby/test_path.rb @@ -35,8 +35,8 @@ class TestPath < Test::Unit::TestCase assert_equal("/sub", File.expand_path("sub", "/")) end if dosish - assert_equal("//machine/share", File.expand_path("/", "//machine/share/sub")) - assert_equal("//machine/share/dir", File.expand_path("/dir", "//machine/share/sub")) + assert_equal("//127.0.0.1/share", File.expand_path("/", "//127.0.0.1/share/sub")) + assert_equal("//127.0.0.1/share/dir", File.expand_path("/dir", "//127.0.0.1/share/sub")) assert_equal("z:/", File.expand_path("/", "z:/sub")) assert_equal("z:/dir", File.expand_path("/dir", "z:/sub")) end @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2010-06-02" +#define RUBY_RELEASE_DATE "2010-06-03" #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -7,7 +7,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 2 +#define RUBY_RELEASE_DAY 3 #include "ruby/version.h" |
