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.

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

3 files changed, 3 insertions, 3 deletions

diff --git a/test/lib/envutil.rb b/test/lib/envutil.rb
index 1193a1a525..4a48ee6ae6 100644
--- a/test/lib/envutil.rb
+++ b/test/lib/envutil.rb
@@ -372,7 +372,7 @@ module Test
   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])
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 1b87246e4e..dcc8ece79d 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -721,7 +721,7 @@ class TestRequire < Test::Unit::TestCase
 
         assert_throw(:blah) do
           x = Thread.current
-          y = Thread.start {
+          Thread.start {
             sleep 0.00001
             x.raise Error.new
           }
diff --git a/version.h b/version.h
index 9c9a265f99..6776fd0ca5 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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