summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/test_open3.rb4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ab3fe8..75a5651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 29 20:10:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/test_open3.rb (test_commandline): use dump instead of
+ shellwords. [ruby-core:23797]
+
Thu Apr 29 18:39:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/thwait.rb (ThreadsWait#join): refined rdoc again.
diff --git a/test/test_open3.rb b/test/test_open3.rb
index f8fb249..24b82e7 100644
--- a/test/test_open3.rb
+++ b/test/test_open3.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'open3'
-require 'shellwords'
require_relative 'ruby/envutil'
class TestOpen3 < Test::Unit::TestCase
@@ -60,8 +59,7 @@ class TestOpen3 < Test::Unit::TestCase
end
def test_commandline
- skip "Shellwords is not supported" if /mswin|mingw/ =~ RUBY_PLATFORM
- commandline = Shellwords.join([RUBY, '-e', 'print "quux"'])
+ commandline = [RUBY, '-e', 'print :quux'].map{|s|/\s/=~s ? s.dump : s}.join(' ')
Open3.popen3(commandline) {|i,o,e,t|
assert_equal("quux", o.read)
}