diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index 3434957df3..1fc6596a1d 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -74,12 +74,12 @@ class TestRequire < Test::Unit::TestCase assert_separately(%w[--disable=gems], <<-INPUT) # leave paths for require encoding objects bug = "#{bug8165} require #{encoding} path" - path = "#{require_path}" + require_path = "#{require_path}" enc_path = Regexp.new(Regexp.escape(RUBY_PLATFORM)) $:.replace([IO::NULL] + $:.reject {|path| enc_path !~ path}) assert_nothing_raised(LoadError, bug) { - assert(require(path), bug) - assert(!require(path), bug) + assert(require(require_path), bug) + assert(!require(require_path), bug) } INPUT } diff --git a/version.h b/version.h index b92e50c2d3..28996b299e 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2014-02-19" -#define RUBY_PATCHLEVEL 436 +#define RUBY_RELEASE_DATE "2014-02-20" +#define RUBY_PATCHLEVEL 437 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 20 #include "ruby/version.h"