summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-06 08:27:41 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-06 08:27:41 +0000
commit4d419a54f38a7c6a7b8eed9ab522efff4d858749 (patch)
tree8d0f98ea8699465c6c04de9ad5e0891256aa0446
parent0918c27a40129a34ed5f2468f742b4912c4ae76d (diff)
* test/lib/memory_status.rb: removed redundant path.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--test/lib/memory_status.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index de22d2d621..cc4e48a17c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul 6 16:42:10 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * test/lib/memory_status.rb: removed redundant path.
+
Mon Jul 6 01:18:11 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/lib/test/unit/parallel.rb: make @@project_dir one level
diff --git a/test/lib/memory_status.rb b/test/lib/memory_status.rb
index c27776014c..b275db05e6 100644
--- a/test/lib/memory_status.rb
+++ b/test/lib/memory_status.rb
@@ -60,7 +60,7 @@ module Memory
end
else
PAT = /^\s*(\d+)\s+(\d+)$/
- require_relative '../lib/find_executable'
+ require_relative 'find_executable'
if PSCMD = EnvUtil.find_executable("ps", "-ovsz=", "-orss=", "-p", $$.to_s) {|out| PAT =~ out}
PSCMD.pop
end