diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-26 11:25:45 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-26 11:25:45 +0000 |
| commit | 12d48f4ef242eaa48844e9dbbbd5ae22b87870c3 (patch) | |
| tree | c769af637d92fb1f5dfee88e5f052d18177b2d13 | |
| parent | 6190bb4d8ad7a07ddb1da8fc687b20612743a34a (diff) | |
| download | ruby-12d48f4ef242eaa48844e9dbbbd5ae22b87870c3.tar.gz | |
* 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/trunk@37862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_argf.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Nov 26 20:23:49 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * test/ruby/test_argf.rb (TestArgf#test_chars): since marshal data is + binary, shouldn't pass via text mode. use base64 encoded data. + Mon Nov 26 19:45:18 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * ruby_atomic.h (ATOMIC_CAS): new macro for compare-and-exchange. diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb index a58b70db52..7fb9348c1e 100644 --- a/test/ruby/test_argf.rb +++ b/test/ruby/test_argf.rb @@ -781,9 +781,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 |