nagachika	2014-05-19 23:31:55 +0900 (Mon, 19 May 2014)

  New Revision: 46023

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

  Log:
    merge revision(s) r46010:
    
    envutil.rb: fix argument
    
    * test/ruby/envutil.rb (assert_separately): fix missing `message`
      argument to FailDesc.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/test/ruby/envutil.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46022)
+++ ruby_2_1/version.h	(revision 46023)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-05-19"
-#define RUBY_PATCHLEVEL 104
+#define RUBY_PATCHLEVEL 105
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5
Index: ruby_2_1/test/ruby/envutil.rb
===================================================================
--- ruby_2_1/test/ruby/envutil.rb	(revision 46022)
+++ ruby_2_1/test/ruby/envutil.rb	(revision 46023)
@@ -342,7 +342,7 @@ eom https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/envutil.rb#L342
         args.insert((Hash === args.first ? 1 : 0), "--disable=gems", *$:.map {|l| "-I#{l}"})
         stdout, stderr, status = EnvUtil.invoke_ruby(args, src, true, true, **opt)
         abort = status.coredump? || (status.signaled? && ABORT_SIGNALS.include?(status.termsig))
-        assert(!abort, FailDesc[status, stderr])
+        assert(!abort, FailDesc[status, nil, stderr])
         self._assertions += stdout[/^assertions=(\d+)/, 1].to_i
         begin
           res = Marshal.load(stdout.unpack("m")[0])

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46010


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