Tag Phoronix Test Suite 1.6.0 "Tydal" Alpha 2

6 files changed, 11 insertions, 10 deletions

diff --git a/pts-core/functions/pts-functions-install.php b/pts-core/functions/pts-functions-install.php
index 4813307..5e96e53 100644
--- a/pts-core/functions/pts-functions-install.php
+++ b/pts-core/functions/pts-functions-install.php
@@ -528,4 +528,4 @@ function pts_generate_download_cache()
 	file_put_contents(PTS_DOWNLOAD_CACHE_DIR . "pts-download-cache.xml", $cache_xml);
 }
 
-?>TO
+?>
diff --git a/pts-core/functions/pts-functions-run.php b/pts-core/functions/pts-functions-run.php
index a108bee..97b06cf 100644
--- a/pts-core/functions/pts-functions-run.php
+++ b/pts-core/functions/pts-functions-run.php
@@ -856,7 +856,7 @@ function pts_run_test($test_identifier, $extra_arguments = "", $arguments_descri
 		{
 			if(pts_is_assignment("TEST_RESULTS_IDENTIFIER") && (pts_string_bool(pts_read_user_config(P_OPTION_LOG_BENCHMARKFILES, "FALSE")) || pts_read_assignment("IS_PCQS_MODE") != false || getenv("SAVE_BENCHMARK_LOGS") != false))
 			{
-				$backup_log_dir = SAVE_RESULTS_DIR . pts_read_assignment(SAVE_FILE_NAME) . "/benchmark-logs/" . pts_read_assignment("TEST_RESULTS_IDENTIFIER") . "/";
+				$backup_log_dir = SAVE_RESULTS_DIR . pts_read_assignment("SAVE_FILE_NAME") . "/benchmark-logs/" . pts_read_assignment("TEST_RESULTS_IDENTIFIER") . "/";
 				$backup_filename = basename($benchmark_log_file);
 				@mkdir($backup_log_dir, 0777, true);
 				@copy($benchmark_log_file, $backup_log_dir . $backup_filename);
diff --git a/pts-core/functions/pts.php b/pts-core/functions/pts.php
index fce2f55..2573a6b 100644
--- a/pts-core/functions/pts.php
+++ b/pts-core/functions/pts.php
@@ -21,7 +21,7 @@
 	along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-define("PTS_VERSION", "1.6.0a1");
+define("PTS_VERSION", "1.6.0a2");
 define("PTS_CODENAME", "TYDAL");
 define("PTS_TYPE", "DESKTOP");
 
diff --git a/pts-core/objects/bilde_renderer/bilde_svg_renderer.php b/pts-core/objects/bilde_renderer/bilde_svg_renderer.php
index 7b74909..cb797e4 100644
--- a/pts-core/objects/bilde_renderer/bilde_svg_renderer.php
+++ b/pts-core/objects/bilde_renderer/bilde_svg_renderer.php
@@ -48,11 +48,11 @@ class bilde_svg_renderer extends bilde_renderer
 
 	public function write_text_left($text_string, $font_type, $font_size, $font_color, $bound_x1, $bound_y1, $bound_x2, $bound_y2, $rotate_text = false)
 	{
-		$text_dimensions = $this->text_string_dimensions($text_string, $this->graph_font, $font_size);
+		$text_dimensions = $this->text_string_dimensions($text_string, $font_type, $font_size);
 		$text_width = $text_dimensions[0];
 		$text_height = $text_dimensions[1];
 
-		if($rotate == false)
+		if($rotate_text == false)
 		{
 			$text_x = $bound_x1;
 			$text_y = $bound_y1 + round($text_height / 2);
@@ -69,7 +69,7 @@ class bilde_svg_renderer extends bilde_renderer
 	}
 	public function write_text_right($text_string, $font_type, $font_size, $font_color, $bound_x1, $bound_y1, $bound_x2, $bound_y2, $rotate_text = false)
 	{
-		$text_dimensions = $this->text_string_dimensions($text_string, $this->graph_font, $font_size);
+		$text_dimensions = $this->text_string_dimensions($text_string, $font_type, $font_size);
 		$text_width = $text_dimensions[0];
 		$text_height = $text_dimensions[1];
 
@@ -92,10 +92,10 @@ class bilde_svg_renderer extends bilde_renderer
 	}
 	public function write_text_center($text_string, $font_type, $font_size, $font_color, $bound_x1, $bound_y1, $bound_x2, $bound_y2, $rotate_text = false)
 	{
-		$text_dimensions = $this->text_string_dimensions(strtoupper($text_string), $this->graph_font, $font_size, $big_type);
+		$text_dimensions = $this->text_string_dimensions(strtoupper($text_string), $font_type, $font_size, $big_type);
 		$text_height = $text_dimensions[1];
 
-		$text_dimensions = $this->text_string_dimensions($text_string, $this->graph_font, $font_size, $big_type);
+		$text_dimensions = $this->text_string_dimensions($text_string, $font_type, $font_size, $big_type);
 		$text_width = $text_dimensions[0];
 
 		if($rotate_text == false)
@@ -136,7 +136,7 @@ class bilde_svg_renderer extends bilde_renderer
 	}
 	public function draw_line($start_x, $start_y, $end_x, $end_y, $color, $line_width = 1)
 	{
-		$this->image .= "<line x1=\"" . round($start_x) . "\" y1=\"" . round($start_y + $i) . "\" x2=\"" . round($end_x) . "\" y2=\"" . round($end_y + $i) . "\" stroke=\"" . $color . "\" stroke-width=\"" . $line_width . "px\" />\n";
+		$this->image .= "<line x1=\"" . round($start_x) . "\" y1=\"" . round($start_y) . "\" x2=\"" . round($end_x) . "\" y2=\"" . round($end_y) . "\" stroke=\"" . $color . "\" stroke-width=\"" . $line_width . "px\" />\n";
 	}
 
 	public function png_image_to_type($file)
diff --git a/pts-core/options/install_test.php b/pts-core/options/install_test.php
index df1c845..d808443 100644
--- a/pts-core/options/install_test.php
+++ b/pts-core/options/install_test.php
@@ -72,6 +72,7 @@ class install_test implements pts_option_interface
 
 			// Any external dependencies?
 			echo "\n";
+
 			pts_install_package_on_distribution($test);
 
 			// Install tests
diff --git a/pts-core/options/run_test.php b/pts-core/options/run_test.php
index 6f8c8cc..fc35bc7 100644
--- a/pts-core/options/run_test.php
+++ b/pts-core/options/run_test.php
@@ -149,7 +149,7 @@ class run_test implements pts_option_interface
 
 				$validate_r = pts_validate_save_results_name($PROPOSED_FILE_NAME, $TO_RUN, $TO_RUN_TYPE);
 
-				if($PROPOSED_FILE_NAME != $validare_r[0] && !empty($validate_r[1]))
+				if($PROPOSED_FILE_NAME != $validate_r[0] && !empty($validate_r[1]))
 				{
 					$PROPOSED_FILE_NAME = $validate_r[0];
 					$CUSTOM_TITLE = $validate_r[1];