summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-26 12:51:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-26 12:51:50 +0000
commit7b3473a13a5e06025940cf5858d30b011c215b74 (patch)
tree1b9ae8d6433f896c4f2e82249cc123abe634023b
parentbe5564a178ee453b7d6fedc7c312bec01e29dde2 (diff)
dtrace: chomp CR
* test/dtrace/helper.rb (DTrace::TestCase::READ_PROBES): chomp CR by pty. fix up r55736. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/dtrace/helper.rb2
-rw-r--r--test/dtrace/test_method_cache.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/test/dtrace/helper.rb b/test/dtrace/helper.rb
index 22865aa..1417185 100644
--- a/test/dtrace/helper.rb
+++ b/test/dtrace/helper.rb
@@ -32,7 +32,7 @@ module DTrace
when /darwin/i
READ_PROBES = proc do |cmd|
PTY.spawn(*cmd) do |io, _|
- break io.readlines
+ break io.readlines.each {|line| line.sub!(/\r$/, "")}
end
end
end
diff --git a/test/dtrace/test_method_cache.rb b/test/dtrace/test_method_cache.rb
index 7ecec19..a101b5d 100644
--- a/test/dtrace/test_method_cache.rb
+++ b/test/dtrace/test_method_cache.rb
@@ -9,9 +9,9 @@ module DTrace
class String; def abc() end end
class Object; def abc() end end
code
- assert_not_includes lines, "String #{rbfile} 1\n"
- assert_includes lines, "String #{rbfile} 2\n"
- assert_includes lines, "global #{rbfile} 3\n"
+ assert_not_include lines, "String #{rbfile} 1\n"
+ assert_include lines, "String #{rbfile} 2\n"
+ assert_include lines, "global #{rbfile} 3\n"
end
end