summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_io.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ea906ebcd3..249c272fe9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 20 18:39:16 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
+
+ * test/ruby/test_in.rb: Skip test_open_fifo_does_not_block_other_threads
+ on cygwin. Fifos seem to work okay in cygwin, but this test repeatedly
+ hangs.
+
Mon Jun 20 13:35:06 2016 Shugo Maeda <shugo@ruby-lang.org>
* vm.c (invoke_bmethod, invoke_block_from_c_0): revert r52104
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 3f6825d2ec..bfcfbbd06c 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -3253,7 +3253,7 @@ End
assert_equal("foo", t1_value)
EOS
}
- end if /mswin|mingw|bccwin/ !~ RUBY_PLATFORM
+ end if /mswin|mingw|bccwin|cygwin/ !~ RUBY_PLATFORM
def test_open_flag
make_tempfile do |t|