diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-15 07:24:53 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-15 07:24:53 +0000 |
| commit | 9c1588a86d98a5fba4abd63fcec7573bf8089b83 (patch) | |
| tree | 886a00b89bb8a6b22e3689a3e32757212cfd8cc1 /test/minitest | |
| parent | 6e103e8412aff67cfbe877afb25d966ab6eaf09c (diff) | |
merge revision(s) 47111,47212,47451,47452,47680: [Backport #10245]
* test/minitest/test_minitest_unit.rb: removed obsoleted condition
for Ruby 1.8.
* test/ruby/test_time_tz.rb: ditto.
* test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g.
[ruby-core:65058] [Bug #10245] Reported by Vit Ondruch.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/minitest')
| -rw-r--r-- | test/minitest/test_minitest_unit.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/test/minitest/test_minitest_unit.rb b/test/minitest/test_minitest_unit.rb index d3f7d4c1c3..c47aa300c2 100644 --- a/test/minitest/test_minitest_unit.rb +++ b/test/minitest/test_minitest_unit.rb @@ -234,11 +234,7 @@ class TestMiniTestUnit < MetaMetaMetaTestCase end def util_expand_bt bt - if RUBY_VERSION >= '1.9.0' then - bt.map { |f| (f =~ /^\./) ? File.expand_path(f) : f } - else - bt - end + bt.map { |f| (f =~ /^\./) ? File.expand_path(f) : f } end end |