Summary
Description: Unnamed repository; edit this file to name it for gitweb.
Last Change: Wed 2/3/10 13:04
Recent Commits
>
--git a/CHANGE-LOG b/CHANGE-LOG
index 99e9c99..544e702 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -9,6 +9,7 @@ Phoronix Test Suite (git)
- Pts-Grapher updates
- Initial "Batch Mode" support through using batch-run or batch-benchmark and BatchMode options are through ~/.phoronix-test-suite/user-config.xml
- Add "initial-config" argument, which overwrites the user-config.xml with a new default template
+- Many "External Dependencies" improvements. Needs testing and more distribution profiles!
- Other fixes
Phoronix Test Suite 0.2.1
diff --git a/pts-core/functions/pts-functions_linux.php b/pts-core/functions/pts-functions_linux.php
index 66c6f89..2737591 100644
--- a/pts-core/functions/pts-functions_linux.php
+++ b/pts-core/functions/pts-functions_linux.php
@@ -5,14 +5,41 @@
// SYSTEM RELATED
//
-function pts_process_running_string($process)
+function pts_process_running_string($process_arr)
{
- $p = "";
+ $p = array();
+ $p_string = "";
- if(pts_process_running_bool($process))
- $p = $process . " was running on this system. ";
+ if(!is_array($process_arr))
+ $process_arr = array($process_arr);
- return $p;
+ foreach($process_arr as $process)
+ if(pts_process_running_bool($process))
+ array_push($p, $process);
+
+ if(($p_count = count($p)) > 0)
+ {
+ for($i = 0; $i < $p_count; $i++)
+ {
+ $p_string .= $p[$i];
+
+ if($i != ($p_count - 1) && $p_count > 2)
+ $p_string .= ",";
+ $p_string .= " ";
+
+ if($i == ($p_count - 2))
+ $p_string .= "and ";
+ }
+
+ if($p_count == 1)
+ $p_string .= "was";
+ else
+ $p_string .= "were";
+
+ $p_string .= " running on this system. ";
+ }
+
+ return $p_string;
}
function pts_process_running_bool($process)
{
diff --git a/pts-core/pts-run-benchmark.php b/pts-core/pts-run-benchmark.php
index 8a32e43..1247bc0 100644
--- a/pts-core/pts-run-benchmark.php
+++ b/pts-core/pts-run-benchmark.php
@@ -221,7 +221,7 @@ else
if($SAVE_RESULTS)
{
- $test_notes = pts_process_running_string("Compiz") . pts_process_running_string("Firefox");
+ $test_notes = pts_process_running_string(array("Compiz", "Firefox"));
$id = pts_request_new_id();
$RESULTS->setXslBinding("pts-results-viewer/viewer.xsl");
<
Copyright © 2010 by Phoronix Media