merge revision(s) 42439,42453: [Backport #8752]

	* test/coverage/test_coverage.rb (TestCoverage#test_big_code): use `1'
	  instead of `p' to get rid of a side effect.
	  Kernel#p without any argument seems to do nothing, but flushes stdout.
	  and, if stdout is redirected to file, fsync() will be called on
	  Windows.  so, when running test-all on Windows with redirection, such
	  as CI environment, this test took a lot of time.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42492 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 13 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b470f38aa..e62b41b2ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Aug 10 23:59:47 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/coverage/test_coverage.rb (TestCoverage#test_big_code): use `1'
+	  instead of `p' to get rid of a side effect.
+	  Kernel#p without any argument seems to do nothing, but flushes stdout.
+	  and, if stdout is redirected to file, fsync() will be called on
+	  Windows.  so, when running test-all on Windows with redirection, such
+	  as CI environment, this test took a lot of time.
+
 Sun Aug  4 22:42:16 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (wrename): use MoveFileExW instead of MoveFileW,
diff --git a/test/coverage/test_coverage.rb b/test/coverage/test_coverage.rb
index 4d785c3c0e..f4f192a578 100644
--- a/test/coverage/test_coverage.rb
+++ b/test/coverage/test_coverage.rb
@@ -47,7 +47,7 @@ class TestCoverage < Test::Unit::TestCase
     Dir.mktmpdir {|tmp|
       Dir.chdir(tmp) {
         File.open("test.rb", "w") do |f|
-          f.puts "p\n" * 10000
+          f.puts "__id__\n" * 10000
           f.puts "def ignore(x); end"
           f.puts "ignore([1"
           f.puts "])"
diff --git a/version.h b/version.h
index b502ebad29..45293d02c6 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-08-04"
-#define RUBY_PATCHLEVEL 290
+#define RUBY_RELEASE_DATE "2013-08-10"
+#define RUBY_PATCHLEVEL 291
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 10
 
 #include "ruby/version.h"