naruse	2011-07-28 00:33:56 +0900 (Thu, 28 Jul 2011)

  New Revision: 32709

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32709

  Log:
    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.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/fileutils/test_fileutils.rb
    branches/ruby_1_9_3/test/ruby/test_process.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32708)
+++ ruby_1_9_3/ChangeLog	(revision 32709)
@@ -1,3 +1,10 @@
+Thu Jul 28 00:33:47 2011  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* include/ruby/missing.h: define __syscall if the platform has
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 32708)
+++ ruby_1_9_3/version.h	(revision 32709)
@@ -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"
 
Index: ruby_1_9_3/test/ruby/test_process.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_process.rb	(revision 32708)
+++ ruby_1_9_3/test/ruby/test_process.rb	(revision 32709)
@@ -1191,8 +1191,10 @@
   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 }
Index: ruby_1_9_3/test/fileutils/test_fileutils.rb
===================================================================
--- ruby_1_9_3/test/fileutils/test_fileutils.rb	(revision 32708)
+++ ruby_1_9_3/test/fileutils/test_fileutils.rb	(revision 32709)
@@ -913,8 +913,8 @@
     # 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'

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/