aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_signal.rb8
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e09463a47b..8c36dd8ee8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 9 22:11:09 2010 Tanaka Akira <akr@fsij.org>
+
+ * test/ruby/test_signal.rb (TestSignal#test_exit_action): use
+ Process.spawn instead of Process.fork.
+
Mon Aug 9 15:59:02 2010 NARUSE, Yui <naruse@ruby-lang.org>
* lib/rubygems/source_index.rb: rename unused variable.
diff --git a/test/ruby/test_signal.rb b/test/ruby/test_signal.rb
index 5d9d3cd691..0098ccc539 100644
--- a/test/ruby/test_signal.rb
+++ b/test/ruby/test_signal.rb
@@ -1,5 +1,6 @@
require 'test/unit'
require 'timeout'
+require_relative 'envutil'
class TestSignal < Test::Unit::TestCase
def have_fork?
@@ -40,13 +41,14 @@ class TestSignal < Test::Unit::TestCase
begin
r, w = IO.pipe
r0, w0 = IO.pipe
- pid = Process.fork {
+ pid = Process.spawn(EnvUtil.rubybin, '-e', <<-'End', 3=>w, 4=>r0)
+ w = IO.new(3, "w")
+ r0 = IO.new(4, "r")
Signal.trap(:USR1, "EXIT")
- w0.close
w.syswrite("a")
Thread.start { sleep(2) }
r0.sysread(4096)
- }
+ End
r.sysread(1)
sleep 0.1
assert_nothing_raised("[ruby-dev:26128]") {