From f39ed9dcded1d37a2c9a43b2b29feed5228ea012 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 27 Jul 2011 15:33:56 +0000
Subject: [PATCH] merge revision(s) 32707:

	* test/fileutils/test_fileutils.rb: add OpenBSD case.
	  patched by Jeremy Evans [ruby-core:38530] see #5097

	* test/ruby/test_process.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                        | 7 +++++++
 test/fileutils/test_fileutils.rb | 4 ++--
 test/ruby/test_process.rb        | 6 ++++--
 version.h                        | 4 ++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ceb14d0501..a1aa1a54fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jul 28 00:33:47 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 17:59:46 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* include/ruby/missing.h: define __syscall if the platform has
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 }
diff --git a/version.h b/version.h
index dbb913a529..a053099c7b 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
 #define RUBY_PATCHLEVEL -1
 
-#define RUBY_RELEASE_DATE "2011-07-27"
+#define RUBY_RELEASE_DATE "2011-07-28"
 #define RUBY_RELEASE_YEAR 2011
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 28
 
 #include "ruby/version.h"