Merge remote-tracking branch 'origin/master' into next-major-release

* origin/master:
  Use skip rather than "puts WARNING:" when test can't be performed.
  Use proper system path separator in test.

test/test_rake_application_options.rb

@@ -145,7 +145,8 @@ def test_rakefile
   end
 
   def test_rakelib
-    flags(['--rakelibdir', 'A:B:C'], ['--rakelibdir=A:B:C'], ['-R', 'A:B:C'], ['-RA:B:C']) do |opts|
+    dirs = %w(A B C).join(File::PATH_SEPARATOR)
+    flags(['--rakelibdir', dirs], ["--rakelibdir=#{dirs}"], ['-R', dirs], ["-R#{dirs}"]) do |opts|
       assert_equal ['A', 'B', 'C'], opts.rakelib
     end
   end

test/test_rake_functional.rb

@@ -435,7 +435,7 @@ def test_signal_propagation_in_tests
       assert_match(/ATEST/, @out)
       refute_match(/BTEST/, @out)
     else
-      puts "\nWARNING: Signal detect seems broken on this system (#{__FILE__}:#{__LINE__})"
+      skip "Signal detect seems broken on this system"
     end
   end