summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-21 07:04:07 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-21 07:04:07 +0000
commita6241676eab4e02d31849229c8a5aae3931de067 (patch)
tree8e0fdf2ba9f5a52efd5692ec58c3b6ee32e4d2c5 /test
parent7eb193b9911e8dda2c5cb96632775b4c27285bbb (diff)
merge revision(s) 37862:
* test/ruby/test_argf.rb (TestArgf#test_chars): since marshal data is binary, shouldn't pass via text mode. use base64 encoded data. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_argf.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb
index 46e762c09a..1f824152e0 100644
--- a/test/ruby/test_argf.rb
+++ b/test/ruby/test_argf.rb
@@ -767,9 +767,9 @@ class TestArgf < Test::Unit::TestCase
def test_chars
ruby('-e', <<-SRC, @t1.path, @t2.path, @t3.path) do |f|
- print Marshal.dump(ARGF.chars.to_a)
+ print [Marshal.dump(ARGF.chars.to_a)].pack('m')
SRC
- assert_equal(["1", "\n", "2", "\n", "3", "\n", "4", "\n", "5", "\n", "6", "\n"], Marshal.load(f.read))
+ assert_equal(["1", "\n", "2", "\n", "3", "\n", "4", "\n", "5", "\n", "6", "\n"], Marshal.load(f.read.unpack('m').first))
end
end