Summary
Description: Phoronix Test Suite open-source benchmarking development
Last Change: Tue 5/21/13 15:49
Recent Commits
>
--git a/pts-core/library/pts-functions_tests.php b/pts-core/library/pts-functions_tests.php
index cd01f2f..0f2d6a3 100644
--- a/pts-core/library/pts-functions_tests.php
+++ b/pts-core/library/pts-functions_tests.php
@@ -130,11 +130,6 @@ function pts_generate_graphs($test_results_identifier, $save_to_dir = false)
}
$result_file = new pts_result_file($test_results_identifier);
- $pts_version = pts_arrays::last_element($result_file->get_system_pts_version());
- if(empty($pts_version))
- {
- $pts_version = PTS_VERSION;
- }
$generated_graphs = array();
$generated_graph_tables = false;
@@ -175,13 +170,12 @@ function pts_generate_graphs($test_results_identifier, $save_to_dir = false)
}
$chart = new pts_Chart($result_file, null, $table_keys);
- $chart->loadGraphVersion("Phoronix Test Suite " . $pts_version);
$chart->renderChart($save_to_dir . "/result-graphs/" . ($key + 1) . "_table.BILDE_EXTENSION");
$generated_graph_tables = true;
}
}
- $graph = pts_render::render_graph($result_object, $result_file, $save_to, $pts_version);
+ $graph = pts_render::render_graph($result_object, $result_file, $save_to);
array_push($generated_graphs, $graph);
}
diff --git a/pts-core/objects/pts_Graph/pts_Chart.php b/pts-core/objects/pts_Graph/pts_Chart.php
index 5805abb..5cafde3 100644
--- a/pts-core/objects/pts_Graph/pts_Chart.php
+++ b/pts-core/objects/pts_Graph/pts_Chart.php
@@ -31,7 +31,8 @@ class pts_Chart extends pts_Graph
public function __construct(&$result_file, $system_id_keys = null, $result_object_index = -1)
{
- parent::__construct();
+ $result_object = null;
+ parent::__construct($result_object, $result_file);
$this->graph_attr_big_border = false;
$this->result_object_index = $result_object_index;
diff --git a/pts-core/objects/pts_Graph/pts_Graph.php b/pts-core/objects/pts_Graph/pts_Graph.php
index 1d21bc6..e9cdd77 100644
--- a/pts-core/objects/pts_Graph/pts_Graph.php
+++ b/pts-core/objects/pts_Graph/pts_Graph.php
@@ -135,7 +135,9 @@ abstract class pts_Graph
$this->graph_title = $result_object->get_name_formatted();
$this->graph_y_title = $result_object->get_scale_formatted();
$this->test_identifier = $result_object->get_test_name();
+ $this->graph_proportion = $result_object->get_proportion();
$this->addSubTitle($result_object->get_attributes());
+ $this->addInternalIdentifier("Test", $result_object->get_test_name());
}
$this->update_graph_dimensions(-1, -1, true);
@@ -162,6 +164,15 @@ abstract class pts_Graph
if($result_file != null && $result_file instanceOf pts_result_file)
{
$this->is_multi_way_comparison = $result_file->is_multi_way_comparison() && $this->graph_type == "BAR_GRAPH";
+ $this->addInternalIdentifier("Identifier", $result_file->get_suite_name());
+
+ $pts_version = pts_arrays::last_element($result_file->get_system_pts_version());
+ if(empty($pts_version))
+ {
+ $pts_version = PTS_VERSION;
+ }
+
+ $this->graph_version = "Phoronix Test Suite " . $pts_version;
}
$this->graph_font = $font_type;
@@ -198,14 +209,6 @@ abstract class pts_Graph
{
$this->graph_hide_identifiers = true;
}
- public function loadGraphVersion($data)
- {
- $this->graph_version = $data;
- }
- public function loadGraphProportion($data)
- {
- $this->graph_proportion = $data;
- }
public function loadGraphData($data_array)
{
loadGraphValues($data_array);
@@ -393,7 +396,6 @@ abstract class pts_Graph
if(is_numeric($real_maximum))
{
- // disable forcing 100 top when display Percent
if($real_maximum < $this->graph_attr_marks)
{
$maximum = $real_maximum * 1.35;
diff --git a/pts-core/objects/pts_render.php b/pts-core/objects/pts_render.php
index 81dde0f..c6b4e1a 100644
--- a/pts-core/objects/pts_render.php
+++ b/pts-core/objects/pts_render.php
@@ -24,7 +24,7 @@ class pts_render
{
static $last_graph_object = null;
- public static function render_graph(&$result_object, &$result_file = null, $save_as = false, $pts_version = PTS_VERSION, $extra_attributes = null)
+ public static function render_graph(&$result_object, &$result_file = null, $save_as = false, $extra_attributes = null)
{
if($result_file != null && ($result_file->is_multi_way_comparison() || $result_file->is_results_tracker()))
{
@@ -130,12 +130,6 @@ class pts_render
break;
}
- $graph->loadGraphProportion($result_object->get_proportion());
- $graph->loadGraphVersion("Phoronix Test Suite " . $pts_version);
-
- $graph->addInternalIdentifier("Test", $result_object->get_test_name());
- $graph->addInternalIdentifier("Identifier", ($result_file instanceOf pts_result_file ? $result_file->get_suite_name() : null));
-
if($save_as)
{
$graph->saveGraphToFile($save_as);
diff --git a/pts-core/objects/pts_test_install_manager.php b/pts-core/objects/pts_test_install_manager.php
index 02cdf2e..6e70b8f 100644
--- a/pts-core/objects/pts_test_install_manager.php
+++ b/pts-core/objects/pts_test_install_manager.php
@@ -34,7 +34,7 @@ class pts_test_install_manager
if(!pts_test_support_check($identifier))
{
- pts_client::$display->test_install_error($identifier . " is not supported by this system.");
+ //pts_client::$display->test_install_error($identifier . " is not supported by this system.");
}
else if(($e = pts_client::read_env("SKIP_TESTS")) != false && in_array($identifier, explode(",", $e)))
{
<
Copyright © 2013 by Phoronix Media