summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--test/test_tracer.rb4
-rw-r--r--version.h2
3 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e6bbab1085..b4c011884b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* lib/rubygems: Update to RubyGems 2.0.5.
diff --git a/test/test_tracer.rb b/test/test_tracer.rb
index 918fed0446..12f37ac44c 100644
--- a/test/test_tracer.rb
+++ b/test/test_tracer.rb
@@ -8,12 +8,10 @@ class TestTracer < Test::Unit::TestCase
def test_tracer_with_option_r
assert_in_out_err(%w[-rtracer -e 1]) do |(*lines),|
case lines.size
- when 2
- assert_match(%r{rubygems/core_ext/kernel_require\.rb:\d+:Kernel:<:}, lines[0])
when 1
# do nothing
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
assert_equal "#0:-e:1::-: 1", lines.last
end
diff --git a/version.h b/version.h
index 731272261a..df9162968e 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-07-23"
-#define RUBY_PATCHLEVEL 275
+#define RUBY_PATCHLEVEL 276
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 7