[limb-svn] r6919 - 3.x/trunk/limb/tests_runner/src

[svn at limb-project.com]

Author: pachanga
Date: 2008-04-10 23:31:40 +0400 (Thu, 10 Apr 2008)
New Revision: 6919
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6919

Modified:
   3.x/trunk/limb/tests_runner/src/lmbTestRunner.class.php
   3.x/trunk/limb/tests_runner/src/lmbTestShellUI.class.php
Log:
-- memory stats are only made if memory usage function is available

Modified: 3.x/trunk/limb/tests_runner/src/lmbTestRunner.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/src/lmbTestRunner.class.php	2008-04-10 19:16:22 UTC (rev 6918)
+++ 3.x/trunk/limb/tests_runner/src/lmbTestRunner.class.php	2008-04-10 19:31:40 UTC (rev 6919)
@@ -47,13 +47,13 @@
   {
     require_once(dirname(__FILE__) . '/../simpletest.inc.php');
 
-    $this->_startMemoryCheck();
+    $this->_startStats();
     $this->_startCoverage();
 
     $res = $this->_doRun($root_node, $path);
 
     $this->_endCoverage();
-    $this->_endMemoryCheck();
+    $this->_endStats();
     return $res;
   }
 
@@ -66,16 +66,16 @@
     return $test->run($this->_getReporter());
   }
 
-  protected function _startMemoryCheck()
+  protected function _startStats()
   {
     $this->start_time = microtime(true);
-    $this->start_memory_usage = memory_get_usage();
+    $this->start_memory_usage = function_exists('memory_get_usage') ? memory_get_usage() : 0;
   }
 
-  protected function _endMemoryCheck()
+  protected function _endStats()
   {
     $this->end_time = microtime(true);
-    $this->end_memory_usage = memory_get_usage();
+    $this->end_memory_usage = function_exists('memory_get_usage') ? memory_get_usage() : 0;
   }
 
   function getRunTime()
@@ -85,7 +85,10 @@
 
   function getMemoryUsage()
   {
-    return round(($this->end_memory_usage - $this->start_memory_usage) / 1024 /1024, 3);
+    $diff = $this->end_memory_usage - $this->start_memory_usage;
+    if($diff == 0)
+      return null;
+    return round($diff / 1024 /1024, 3);
   }
 
   protected function _startCoverage()

Modified: 3.x/trunk/limb/tests_runner/src/lmbTestShellUI.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/src/lmbTestShellUI.class.php	2008-04-10 19:16:22 UTC (rev 6918)
+++ 3.x/trunk/limb/tests_runner/src/lmbTestShellUI.class.php	2008-04-10 19:31:40 UTC (rev 6919)
@@ -263,7 +263,8 @@
     }
 
     echo 'Tests time: ' . $runner->getRuntime() . " sec.\n";
-    echo 'Tests memory: ' . $runner->getMemoryUsage() . " Mb.\n";
+    if($memory = $runner->getMemoryUsage())
+      echo 'Tests memory usage: ' . $memory . " Mb.\n";
 
     return $res;
   }