archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 09:04:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 32707:

Browse source 
* 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
This commit is contained in:
naruse 2011-07-27 15:33:56 +00:00
parent bed02ef531
commit f39ed9dcde
4 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> Wed Jul 27 17:59:46 2011 NARUSE, Yui <naruse@ruby-lang.org>
* include/ruby/missing.h: define __syscall if the platform has * include/ruby/missing.h: define __syscall if the platform has

4
test/fileutils/test_fileutils.rb
View file

@ -913,8 +913,8 @@ class TestFileUtils
# FreeBSD ufs and tmpfs don't allow to change sticky bit against # FreeBSD ufs and tmpfs don't allow to change sticky bit against
# regular file. It's slightly strange. Anyway it's no effect bit. # regular file. It's slightly strange. Anyway it's no effect bit.
# see /usr/src/sys/ufs/ufs/ufs_chmod() # see /usr/src/sys/ufs/ufs/ufs_chmod()
# NetBSD also denies it. # NetBSD and OpenBSD also denies it.
if /freebsd|netbsd/ !~ RUBY_PLATFORM if /freebsd|netbsd|openbsd/ !~ RUBY_PLATFORM
chmod "u+t,o+t", 'tmp/a' chmod "u+t,o+t", 'tmp/a'
assert_equal 07500, File.stat('tmp/a').mode & 07777 assert_equal 07500, File.stat('tmp/a').mode & 07777
chmod "a-t,a-s", 'tmp/a' chmod "a-t,a-s", 'tmp/a'

6
test/ruby/test_process.rb
View file

@ -1191,8 +1191,10 @@ class TestProcess < Test::Unit::TestCase
end end
def test_wait_and_sigchild def test_wait_and_sigchild
if /freebsd/ =~ RUBY_PLATFORM if /freebsd|openbsd/ =~ RUBY_PLATFORM
skip "this randomly fails on FreeBSD" # 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 end
signal_received = [] signal_received = []
Signal.trap(:CHLD) { signal_received << true } Signal.trap(:CHLD) { signal_received << true }

4
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL -1 #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_YEAR 2011
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 27 #define RUBY_RELEASE_DAY 28
#include "ruby/version.h" #include "ruby/version.h"