nagachika	2013-08-11 00:02:29 +0900 (Sun, 11 Aug 2013)

  New Revision: 42492

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42492

  Log:
    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.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/coverage/test_coverage.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 42491)
+++ ruby_2_0_0/ChangeLog	(revision 42492)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Aug 10 23:59:47 2013  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* win32/win32.c (wrename): use MoveFileExW instead of MoveFileW,
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 42491)
+++ ruby_2_0_0/version.h	(revision 42492)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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"
 
Index: ruby_2_0_0/test/coverage/test_coverage.rb
===================================================================
--- ruby_2_0_0/test/coverage/test_coverage.rb	(revision 42491)
+++ ruby_2_0_0/test/coverage/test_coverage.rb	(revision 42492)
@@ -47,7 +47,7 @@ class TestCoverage < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/coverage/test_coverage.rb#L47
     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 "])"

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42439,42453


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/