summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-17 08:29:58 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-17 08:29:58 +0000
commitc00d51c739003285255c1a285d121761de310572 (patch)
treed93dc32a916279d99b01588df4d26e1867567ed7
parentb6053df008b1f052dd682644bbab13ceb5b91ea8 (diff)
assertions.rb: fix assert_no_memory_leak
* test/lib/test/unit/assertions.rb (assert_no_memory_leak): fix path of memory_status.rb, as this method has been moved. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/lib/test/unit/assertions.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lib/test/unit/assertions.rb b/test/lib/test/unit/assertions.rb
index 41463ea..25c0c10 100644
--- a/test/lib/test/unit/assertions.rb
+++ b/test/lib/test/unit/assertions.rb
@@ -637,14 +637,14 @@ eom
end
def assert_no_memory_leak(args, prepare, code, message=nil, limit: 2.0, rss: false, **opt)
- require_relative 'memory_status'
+ require_relative '../../memory_status'
token = "\e[7;1m#{$$.to_s}:#{Time.now.strftime('%s.%L')}:#{rand(0x10000).to_s(16)}:\e[m"
token_dump = token.dump
token_re = Regexp.quote(token)
envs = args.shift if Array === args and Hash === args.first
args = [
"--disable=gems",
- "-r", File.expand_path("../memory_status", __FILE__),
+ "-r", File.expand_path("../../../memory_status", __FILE__),
*args,
"-v", "-",
]