naruse	2012-02-16 09:25:11 +0900 (Thu, 16 Feb 2012)

  New Revision: 34639

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

  Log:
    merge revision(s) 32731,32734,32738:
    ------------------------------------------------------------------------
    r32731 | naruse | 2011-07-29 16:17:35 +0900 (Fri, 29 Jul 2011) | 3 lines
    
    Use setrlimit(NOFILE,1) on OpenBSD.
    
    Because on OpenBSD it freezes if limit=0.
    ------------------------------------------------------------------------

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

Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34638)
+++ ruby_1_9_3/version.h	(revision 34639)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 122
+#define RUBY_PATCHLEVEL 123
 
 #define RUBY_RELEASE_DATE "2012-02-16"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/ruby/test_process.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_process.rb	(revision 34638)
+++ ruby_1_9_3/test/ruby/test_process.rb	(revision 34639)
@@ -59,9 +59,11 @@
     return unless rlimit_exist?
     with_tmpchdir {
       write_file 's', <<-"End"
+	# if limit=0, this test freeze pn OpenBSD
+	limit = /openbsd/ =~ RUBY_PLATFORM ? 1 : 0
 	result = 1
 	begin
-	  Process.setrlimit(Process::RLIMIT_NOFILE, 0)
+	  Process.setrlimit(Process::RLIMIT_NOFILE, limit)
 	rescue Errno::EINVAL
 	  result = 0
 	end

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