archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 41857:

Browse source 
* test/test_tracer.rb: catch up recent rubygems changes.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-07-22 16:36:19 +00:00
parent b264a7ac99
commit 14044110e0
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Jul 23 01:34:00 2013 Koichi Sasada <ko1@atdot.net>
* test/test_tracer.rb: catch up recent rubygems changes.
Tue Jul 23 01:28:54 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> Tue Jul 23 01:28:54 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* lib/rubygems: Update to RubyGems 2.0.5. * lib/rubygems: Update to RubyGems 2.0.5.

4
test/test_tracer.rb
View file

@ -8,12 +8,10 @@ class TestTracer < Test::Unit::TestCase
def test_tracer_with_option_r def test_tracer_with_option_r
assert_in_out_err(%w[-rtracer -e 1]) do |(*lines),| assert_in_out_err(%w[-rtracer -e 1]) do |(*lines),|
case lines.size case lines.size
when 2
assert_match(%r{rubygems/core_ext/kernel_require\.rb:\d+:Kernel:<:}, lines[0])
when 1 when 1
# do nothing # do nothing
else else
flunk "unexpected output from `ruby -rtracer -e 1`: #{lines.inspect}" assert_match(%r{rubygems/core_ext/kernel_require\.rb:\d+:Kernel:-:}, lines[0])
end end
assert_equal "#0:-e:1::-: 1", lines.last assert_equal "#0:-e:1::-: 1", lines.last
end end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-07-23" #define RUBY_RELEASE_DATE "2013-07-23"
#define RUBY_PATCHLEVEL 275 #define RUBY_PATCHLEVEL 276
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7