nagachika	2015-11-19 10:14:32 +0900 (Thu, 19 Nov 2015)

  New Revision: 52661

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

  Log:
    merge revision(s) 51445: [Backport #11404] [Backport #11481]
    
    envutil.rb: -w for assert_separately
    
    * test/lib/envutil.rb (assert_separately): always add -w option
      for warnings.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/test/lib/envutil.rb
    branches/ruby_2_2/test/ruby/test_require.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52660)
+++ ruby_2_2/version.h	(revision 52661)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
 #define RUBY_RELEASE_DATE "2015-11-19"
-#define RUBY_PATCHLEVEL 192
+#define RUBY_PATCHLEVEL 193
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 11
Index: ruby_2_2/test/ruby/test_require.rb
===================================================================
--- ruby_2_2/test/ruby/test_require.rb	(revision 52660)
+++ ruby_2_2/test/ruby/test_require.rb	(revision 52661)
@@ -721,7 +721,7 @@ class TestRequire < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_require.rb#L721
 
         assert_throw(:blah) do
           x = Thread.current
-          y = Thread.start {
+          Thread.start {
             sleep 0.00001
             x.raise Error.new
           }
Index: ruby_2_2/test/lib/envutil.rb
===================================================================
--- ruby_2_2/test/lib/envutil.rb	(revision 52660)
+++ ruby_2_2/test/lib/envutil.rb	(revision 52661)
@@ -372,7 +372,7 @@ module Test https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/lib/envutil.rb#L372
   end
 eom
         args = args.dup
-        args.insert((Hash === args.first ? 1 : 0), "--disable=gems", *$:.map {|l| "-I#{l}"})
+        args.insert((Hash === args.first ? 1 : 0), "-w", "--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, nil, stderr])

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r51445


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