diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-02 03:34:15 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-02 03:34:15 +0000 |
| commit | 50cc7057af5495c8c50715720de1f3c48918f011 (patch) | |
| tree | 87a5e904a65bd84fbc4c6b825f314449e96f5ece | |
| parent | 25acda257cdc336a83372acc21fb8b899bd25635 (diff) | |
| download | ruby-50cc7057af5495c8c50715720de1f3c48918f011.tar.gz | |
* test/ruby/test_process.rb (TestProcess#test_no_curdir): maybe now
we can test it.
* test/ruby/test_thread.rb (TestThread#test_thread_timer_and_interrupt):
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_process.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_thread.rb | 9 | ||||
| -rw-r--r-- | win32/win32.c | 1 |
4 files changed, 11 insertions, 7 deletions
@@ -3,6 +3,12 @@ Thu May 2 11:32:22 2013 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (poll_child_status): [experimental] set the cause of a child's death to status if its exitcode seems to be an error. + * test/ruby/test_process.rb (TestProcess#test_no_curdir): maybe now + we can test it. + + * test/ruby/test_thread.rb (TestThread#test_thread_timer_and_interrupt): + ditto. + Thu May 2 11:24:00 2013 Zachary Scott <zachary@zacharyscott.net> * lib/yaml.rb: nodoc EngineManager, add History doc #8344 diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index 99723f625f..2d074219cd 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -1356,7 +1356,7 @@ class TestProcess < Test::Unit::TestCase } assert(status.success?, "[ruby-dev:38105]") } - end unless /mswin|bccwin|mingw/ =~ RUBY_PLATFORM + end def test_fallback_to_sh feature = '[ruby-core:32745]' diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index 668f3741e3..d9b8afc752 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -743,12 +743,9 @@ _eom end t1 = Time.now.to_f assert_equal(pid, s.pid, bug5757) - unless /mswin|mingw/ =~ RUBY_PLATFORM - # status of signal is not supported on Windows - assert_equal([false, true, false, Signal.list["INT"]], - [s.exited?, s.signaled?, s.stopped?, s.termsig], - "[s.exited?, s.signaled?, s.stopped?, s.termsig]") - end + assert_equal([false, true, false, Signal.list["INT"]], + [s.exited?, s.signaled?, s.stopped?, s.termsig], + "[s.exited?, s.signaled?, s.stopped?, s.termsig]") assert_in_delta(t1 - t0, 1, 1, bug5757) end diff --git a/win32/win32.c b/win32/win32.c index e6b736795c..1f63426502 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3927,6 +3927,7 @@ poll_child_status(struct ChildRecord *child, int *stat_loc) {STATUS_FLOAT_UNDERFLOW, SIGFPE}, {STATUS_FLOAT_MULTIPLE_FAULTS, SIGFPE}, {STATUS_FLOAT_MULTIPLE_TRAPS, SIGFPE}, + {STATUS_CONTROL_C_EXIT, SIGINT}, {0, 0} }; int i; |