summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--test/fileutils/test_fileutils.rb4
-rw-r--r--test/ruby/test_process.rb6
3 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0dc9fc272d..e203e7b18a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jul 28 00:28:15 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * test/fileutils/test_fileutils.rb: add OpenBSD case.
+ patched by Jeremy Evans [ruby-core:38530] see #5097
+
+ * test/ruby/test_process.rb: ditto.
+
Wed Jul 27 22:46:59 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
* test/rinda/test_rinda.rb (test_remote_array_and_hash):
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 214f977ce5..d4068e5c86 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -913,8 +913,8 @@ class TestFileUtils
# FreeBSD ufs and tmpfs don't allow to change sticky bit against
# regular file. It's slightly strange. Anyway it's no effect bit.
# see /usr/src/sys/ufs/ufs/ufs_chmod()
- # NetBSD also denies it.
- if /freebsd|netbsd/ !~ RUBY_PLATFORM
+ # NetBSD and OpenBSD also denies it.
+ if /freebsd|netbsd|openbsd/ !~ RUBY_PLATFORM
chmod "u+t,o+t", 'tmp/a'
assert_equal 07500, File.stat('tmp/a').mode & 07777
chmod "a-t,a-s", 'tmp/a'
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index aad043874e..ba3aeb9825 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1191,8 +1191,10 @@ class TestProcess < Test::Unit::TestCase
end
def test_wait_and_sigchild
- if /freebsd/ =~ RUBY_PLATFORM
- skip "this randomly fails on FreeBSD"
+ if /freebsd|openbsd/ =~ RUBY_PLATFORM
+ # this relates #4173
+ # When ruby can use 2 cores, signal and wait4 may miss the signal.
+ skip "this fails on FreeBSD and OpenBSD on multithreaded environment"
end
signal_received = []
Signal.trap(:CHLD) { signal_received << true }