ruby-changes:23199
From: shirosaki <ko1@a...>
Date: Sat, 7 Apr 2012 23:10:37 +0900 (JST)
Subject: [ruby-changes:23199] shirosaki:r35249 (trunk): * test/ruby/test_thread.rb
shirosaki 2012-04-07 23:10:25 +0900 (Sat, 07 Apr 2012) New Revision: 35249 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35249 Log: * test/ruby/test_thread.rb (TestThreadGroup#test_thread_timer_and_interrupt): skip on Windows. Process.kill cannot kill a subprocess if CREATE_NEW_PROCESS_GROUP flag is not specified in a call to CreateProcessW(). * win32/win32.c (CreateChild): revert the usage of CREATE_NEW_PROCESS_GROUP flag for compatibility. [ruby-core:43245][Bug #6131] Modified files: trunk/ChangeLog trunk/test/ruby/test_thread.rb trunk/win32/win32.c Index: ChangeLog =================================================================== --- ChangeLog (revision 35248) +++ ChangeLog (revision 35249) @@ -1,3 +1,14 @@ +Sat Apr 7 22:32:00 2012 Hiroshi Shirosaki <h.shirosaki@g...> + + * test/ruby/test_thread.rb + (TestThreadGroup#test_thread_timer_and_interrupt): skip on Windows. + Process.kill cannot kill a subprocess if CREATE_NEW_PROCESS_GROUP + flag is not specified in a call to CreateProcessW(). + + * win32/win32.c (CreateChild): revert the usage of + CREATE_NEW_PROCESS_GROUP flag for compatibility. + [ruby-core:43245][Bug #6131] + Sat Apr 7 10:28:40 2012 Aaron Patterson <aaron@t...> * ext/psych/lib/psych.rb: bumping up psych version to match release. Index: win32/win32.c =================================================================== --- win32/win32.c (revision 35248) +++ win32/win32.c (revision 35249) @@ -1137,7 +1137,7 @@ aStartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE); } - dwCreationFlags = (CREATE_NEW_PROCESS_GROUP | NORMAL_PRIORITY_CLASS); + dwCreationFlags = NORMAL_PRIORITY_CLASS; if (lstrlenW(cmd) > 32767) { child->pid = 0; /* release the slot */ Index: test/ruby/test_thread.rb =================================================================== --- test/ruby/test_thread.rb (revision 35248) +++ test/ruby/test_thread.rb (revision 35249) @@ -681,6 +681,7 @@ end def test_thread_timer_and_interrupt + skip 'Process.kill cannot kill a subprocess' if /mswin|mingw/ =~ RUBY_PLATFORM bug5757 = '[ruby-dev:44985]' t0 = Time.now.to_f pid = nil -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/