Summary
Description: Phoronix Test Suite open-source benchmarking development
Last Change: Fri 5/17/13 22:52
Recent Commits
>
--git a/pts-core/functions/pts-functions-run.php b/pts-core/functions/pts-functions-run.php
index 349e22f..d632745 100644
--- a/pts-core/functions/pts-functions-run.php
+++ b/pts-core/functions/pts-functions-run.php
@@ -19,14 +19,14 @@ function pts_recurse_call_benchmark($benchmarks_array, $arguments_array, $save_r
$test_result = pts_run_benchmark($benchmarks_array[$i], $arguments_array[$i], $arguments_description[$i]);
if($save_results)
- pts_save_benchmark_result($tandem_xml, $benchmarks_array[$i], $arguments_array[$i], $results_identifier, $test_result, $arguments_description[$i], pts_request_new_id());
+ pts_record_benchmark_result($tandem_xml, $benchmarks_array[$i], $arguments_array[$i], $results_identifier, $test_result, $arguments_description[$i], pts_request_new_id());
if($i != (count($benchmarks_array) - 1))
sleep(pts_read_user_config("PhoronixTestSuite/Options/Benchmarking/SleepTimeBetweenTests", 5));
}
}
}
-function pts_save_benchmark_result(&$tandem_xml, $benchmark, $arguments, $identifier, $result, $description, $tandem_id = 128)
+function pts_record_benchmark_result(&$tandem_xml, $benchmark, $arguments, $identifier, $result, $description, $tandem_id = 128)
{
if($result > -1 && strlen($result) < 12)
{
@@ -75,7 +75,7 @@ function pts_save_benchmark_file($PROPOSED_FILE_NAME, &$RESULTS = null, $RAW_TEX
pts_save_result("$REAL_FILE_NAME.xml", $R_FILE);
if(!is_file(SAVE_RESULTS_LOCATION . "$PROPOSED_FILE_NAME.xml"))
- copy(SAVE_RESULTS_LOCATION . "$REAL_FILE_NAME.xml", SAVE_RESULTS_LOCATION . "$PROPOSED_FILE_NAME.xml");
+ pts_save_result("$REAL_FILE_NAME.xml", file_get_contents(SAVE_RESULTS_LOCATION . "$PROPOSED_FILE_NAME.xml"));
else
{
// Merge Results
diff --git a/pts-core/functions/pts-functions.php b/pts-core/functions/pts-functions.php
index 6da66d2..5e3f0c0 100644
--- a/pts-core/functions/pts-functions.php
+++ b/pts-core/functions/pts-functions.php
@@ -138,11 +138,16 @@ function pts_benchmark_type($identifier)
else
return false;
}
-function pts_save_result($save_to, $save_results, $directory = null)
+function pts_save_result($save_to = null, $save_results = null, $directory = null)
{
if($directory == null)
$directory = SAVE_RESULTS_LOCATION;
+ if(strpos($save_to, ".xml") === FALSE)
+ {
+ $save_to .= ".xml";
+ }
+
if(!is_dir($directory))
mkdir($directory);
@@ -155,7 +160,12 @@ function pts_save_result($save_to, $save_results, $directory = null)
copy("pts-core/pts-results-viewer/pts-viewer.css", $directory . "pts-results-viewer/pts-viewer.css");
}
- return file_put_contents(SAVE_RESULTS_LOCATION . $save_to, $save_results);
+ if($save_to == null || $save_results == null)
+ $bool = true;
+ else
+ $bool = file_put_contents($directory . $save_to, $save_results);
+
+ return $bool;
}
function pts_process_register($process)
{
diff --git a/pts-core/pts-merge-results.php b/pts-core/pts-merge-results.php
index 9554504..0be487f 100644
--- a/pts-core/pts-merge-results.php
+++ b/pts-core/pts-merge-results.php
@@ -27,12 +27,10 @@ if(empty($MERGE_TO))
$MERGE_TO = SAVE_RESULTS_LOCATION . "merge-$rand_file.xml";
}while(is_file($MERGE_TO));
}
-$MERGE_TO = pts_input_correct_results_path($MERGE_TO);
// Merge Results
$MERGED_RESULTS = pts_merge_benchmarks(file_get_contents($BASE_FILE), file_get_contents($MERGE_FROM_FILE));
-pts_save_result("index", "");
-file_put_contents($MERGE_TO, $MERGED_RESULTS);
+pts_save_result($MERGE_TO, $MERGED_RESULTS);
display_web_browser($MERGE_TO);
Copyright © 2013 by Phoronix Media