summaryrefslogtreecommitdiff
path: root/bootstraptest
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-04 11:23:13 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-04 11:23:13 +0000
commit31f3a2e780330621b011f8631a6ebc6753341bb6 (patch)
tree34fb54f110f795e10e920a6e7b32f61ad624bac6 /bootstraptest
parent263cd01a31d65e0c58acf8df7a3f6a07c054b51c (diff)
bootstrap/runner.rb must be run with Ruby 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bootstraptest')
-rwxr-xr-xbootstraptest/runner.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index c885b7e..a309489 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -399,7 +399,8 @@ end
def with_stderr
out = err = nil
- IO.pipe do |r, w|
+ begin
+ r, w = IO.pipe
stderr = $stderr.dup
$stderr.reopen(w)
w.close
@@ -410,6 +411,9 @@ def with_stderr
$stderr.reopen(stderr)
err = reader.value
end
+ ensure
+ w.close rescue nil
+ r.close rescue nil
end
return out, err
end