aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2020-09-22 11:22:04 -0700
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-12-04 20:16:00 +0900
commit6f14a30022e284398017b47d37f3f717f384f985 (patch)
tree01783fbc663f00cf8efedd0219ff3b2245715c23
parent60b57866ac64ef8a21951c7d5ff7b7f98e1ce15f (diff)
downloadruby-6f14a30022e284398017b47d37f3f717f384f985.tar.gz
[ruby/logger] Consider cygwin a Windows platform
This should fix Ruby Bug 12468. https://github.com/ruby/logger/commit/49de53d1fc
-rw-r--r--lib/logger/log_device.rb2
-rw-r--r--test/logger/test_logdevice.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/logger/log_device.rb b/lib/logger/log_device.rb
index fe7d54fb81..96d77b7b6a 100644
--- a/lib/logger/log_device.rb
+++ b/lib/logger/log_device.rb
@@ -135,7 +135,7 @@ class Logger
end
end
- if /mswin|mingw/ =~ RUBY_PLATFORM
+ if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
def lock_shift_log
yield
end
diff --git a/test/logger/test_logdevice.rb b/test/logger/test_logdevice.rb
index 2a01dab17f..6fefd356cd 100644
--- a/test/logger/test_logdevice.rb
+++ b/test/logger/test_logdevice.rb
@@ -451,7 +451,7 @@ class TestLogDevice < Test::Unit::TestCase
end
ensure
logdev0.close
- end unless /mswin|mingw/ =~ RUBY_PLATFORM
+ end unless /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
def test_shifting_midnight
Dir.mktmpdir do |tmpdir|