summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-14 06:06:40 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-14 06:06:40 +0000
commit799680354ebe7cc7af7fed9766451df27e2f28fc (patch)
treeb7f9d69f8b84f3d84d73102f2efcb1f93475f205 /lib
parent391b579097f233cb734f89c6c39257e77473fa51 (diff)
* lib/test/unit/assertions.rb (build_message): skip escaped
question marks. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/test/unit/assertions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index 49987fab57..39a3c85600 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -317,7 +317,7 @@ EOT
def build_message(head, template=nil, *arguments) #:nodoc:
template &&= template.chomp
- template.gsub(/\?/) { mu_pp(arguments.shift) }
+ template.gsub(/\G((?:[^\\]|\\.)*?)(\\)?\?/) { $1 + ($2 ? "?" : mu_pp(arguments.shift)) }
end
end
end