Summary
Description: Unnamed repository; edit this file to name it for gitweb.
Last Change: Wed 2/3/10 13:04
Recent Commits
>
--git a/pts-core/functions/pts-functions-merge.php b/pts-core/functions/pts-functions-merge.php
index 7339cd8..40acb15 100644
--- a/pts-core/functions/pts-functions-merge.php
+++ b/pts-core/functions/pts-functions-merge.php
@@ -115,7 +115,7 @@ function pts_merge_benchmarks($OLD_RESULTS, $NEW_RESULTS)
// Same hardware and software?
- if(count($original_system_hardware) == 1 && count($new_system_hardware) == 1 && $original_system_hardware[0] == $new_system_hardware[0] && $original_system_software[0] == $new_system_software[0] && $original_pts_version[0] == $new_pts_version[0])
+ if(count($original_system_hardware) == 1 && count($new_system_hardware) == 1 && $original_system_hardware[0] == $new_system_hardware[0] && $original_system_software[0] == $new_system_software[0] && $original_pts_version[0] == $new_pts_version[0] && $original_system_notes[0] == $new_system_notes[0])
{
$USE_ID = pts_request_new_id();
$RESULTS->addXmlObject("PhoronixTestSuite/System/Hardware", $USE_ID, $original_system_hardware[0]);
diff --git a/pts-core/functions/pts-functions_linux.php b/pts-core/functions/pts-functions_linux.php
index e5b9254..5141cd9 100644
--- a/pts-core/functions/pts-functions_linux.php
+++ b/pts-core/functions/pts-functions_linux.php
@@ -5,6 +5,26 @@
// SYSTEM RELATED
//
+function pts_process_running_string($process)
+{
+ $p = "";
+
+ if(pts_process_running_bool($process))
+ $p = $process . " was running on this system. ";
+
+ return $p;
+}
+function pts_process_running_bool($process)
+{
+ $running = trim(shell_exec("ps -A | grep " . strtolower($process)));
+
+ if(!empty($running))
+ $running = true;
+ else
+ $running = false;
+
+ return $running;
+}
function pts_posix_username()
{
$userinfo = posix_getpwuid(posix_getuid());
diff --git a/pts-core/pts-run-benchmark.php b/pts-core/pts-run-benchmark.php
index ced4c32..fbceaa6 100644
--- a/pts-core/pts-run-benchmark.php
+++ b/pts-core/pts-run-benchmark.php
@@ -218,13 +218,15 @@ else
if($SAVE_RESULTS)
{
+ $test_notes = pts_process_running_string("Compiz") . pts_process_running_string("Firefox");
+
$id = pts_request_new_id();
$RESULTS->setXslBinding("pts-results-viewer/viewer.xsl");
$RESULTS->addXmlObject("PhoronixTestSuite/System/Hardware", $id, pts_hw_string());
$RESULTS->addXmlObject("PhoronixTestSuite/System/Software", $id, pts_sw_string());
$RESULTS->addXmlObject("PhoronixTestSuite/System/Author", $id, pts_current_user());
$RESULTS->addXmlObject("PhoronixTestSuite/System/TestDate", $id, date("F j, Y h:i A"));
- $RESULTS->addXmlObject("PhoronixTestSuite/System/TestNotes", $id, " ");
+ $RESULTS->addXmlObject("PhoronixTestSuite/System/TestNotes", $id, trim($test_notes));
$RESULTS->addXmlObject("PhoronixTestSuite/System/Version", $id, PTS_VERSION);
$RESULTS->addXmlObject("PhoronixTestSuite/System/AssociatedIdentifiers", $id, $RESULTS_IDENTIFIER);
<
Copyright © 2010 by Phoronix Media