summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-12-28 10:17:55 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-12-28 10:17:55 -0500
commite73f1137c8cbaa38e2225b836d8b560c18fc9070 (patch)
tree6eac3c15cd5745d4463dccded3bfc2e582ec581c
parent9094d2b216723bdf20f3c1e3bae7377bfbfc2f56 (diff)
downloadphoronix-test-suite-upstream-e73f1137c8cbaa38e2225b836d8b560c18fc9070.zip
phoronix-test-suite-upstream-e73f1137c8cbaa38e2225b836d8b560c18fc9070.tar.gz
phoronix-test-suite-upstream-e73f1137c8cbaa38e2225b836d8b560c18fc9070.tar.xz
pts-core: Archive installation output of tests in the test's directory
in file install.log
-rw-r--r--CHANGE-LOG1
-rwxr-xr-xphoronix-test-suite3
-rw-r--r--pts-core/functions/pts-functions-install.php7
-rw-r--r--pts-core/functions/pts-functions_tests.php1
-rw-r--r--pts-core/objects/bilde_renderer/bilde_swf_renderer.php19
-rw-r--r--pts-core/options/run_test.php1
6 files changed, 26 insertions, 6 deletions
diff --git a/CHANGE-LOG b/CHANGE-LOG
index 87119b7..7e1c020 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -10,6 +10,7 @@ Phoronix Test Suite (Git)
- pts-core: Add pts_installed_test_tandem_XmlReader object
- pts-core: Clean up Display / X.Org server reported string
- pts-core: Eliminate use of most preg_ functions
+- pts-core: Archive installation output of tests in the test's directory in file install.log
- pts: Add UXA acceleration check to GtkPerf test note reporting
- pts: Add 2d-test base profile that reports 2D acceleration mode using Cascading Test Profiles
- pts_Graph: Tweak formatting of basic graph attributes
diff --git a/phoronix-test-suite b/phoronix-test-suite
index b7a1c46..8daa470 100755
--- a/phoronix-test-suite
+++ b/phoronix-test-suite
@@ -66,7 +66,8 @@ if [ ! -f pts-core/phoronix-test-suite.php ]
then
cat <<'EOT'
-To run the Phoronix Test Suite locally you must first change directories to phoronix-test-suite/ or install the program using the install-sh script. For support visit: http://www.phoronix-test-suite.com/
+To run the Phoronix Test Suite locally you must first change directories to phoronix-test-suite/
+or install the program using the install-sh script. For support visit: http://www.phoronix-test-suite.com/
EOT
exit
diff --git a/pts-core/functions/pts-functions-install.php b/pts-core/functions/pts-functions-install.php
index 19ba3c1..d2d08f8 100644
--- a/pts-core/functions/pts-functions-install.php
+++ b/pts-core/functions/pts-functions-install.php
@@ -426,7 +426,12 @@ function pts_install_test($identifier)
pts_user_message($pre_install_message);
- echo pts_call_test_script($identifier, "install", null, TEST_ENV_DIR . $identifier . "/", pts_run_additional_vars($identifier), false);
+ echo $install_log = pts_call_test_script($identifier, "install", null, TEST_ENV_DIR . $identifier . "/", pts_run_additional_vars($identifier), false);
+
+ if(!empty($install_log))
+ {
+ @file_put_contents(TEST_ENV_DIR . $identifier . "/install.log", $install_log);
+ }
pts_user_message($post_install_message);
diff --git a/pts-core/functions/pts-functions_tests.php b/pts-core/functions/pts-functions_tests.php
index 3dd5cd5..750dfe9 100644
--- a/pts-core/functions/pts-functions_tests.php
+++ b/pts-core/functions/pts-functions_tests.php
@@ -125,6 +125,7 @@ function pts_save_result($save_to = null, $save_results = null)
if(getenv("REVERSE_GRAPH_PLOTTING") != false)
{
+ // Plot results in reverse order on graphs if REVERSE_GRAPH_PLOTTING env variable is set
$results_identifiers[$i] = array_reverse($results_identifiers[$i]);
$results_values[$i] = array_reverse($results_values[$i]);
}
diff --git a/pts-core/objects/bilde_renderer/bilde_swf_renderer.php b/pts-core/objects/bilde_renderer/bilde_swf_renderer.php
index dd63a11..c6b0dc0 100644
--- a/pts-core/objects/bilde_renderer/bilde_swf_renderer.php
+++ b/pts-core/objects/bilde_renderer/bilde_swf_renderer.php
@@ -64,15 +64,14 @@ class bilde_swf_renderer extends bilde_renderer
public function draw_rectangle($x1, $y1, $width, $height, $background_color)
{
- /*
- $points = array(
+ /* $points = array(
$x1, $y1,
$x1 + $height, $y1,
$x1 + $height, $y1 + $width,
$x1, $y1 + $width
);
$this->draw_polygon($points, $background_color, $background_color, 1);
- */
+ */
$rect = new SWFShape();
$rect->setLine(1, $background_color[0], $background_color[1], $background_color[2]);
$rect->setRightFill($background_color[0], $background_color[1], $background_color[2]);
@@ -85,6 +84,14 @@ class bilde_swf_renderer extends bilde_renderer
}
public function draw_rectangle_border($x1, $y1, $width, $height, $border_color)
{
+ /* $points = array(
+ $x1, $y1,
+ $x1 + $height, $y1,
+ $x1 + $height, $y1 + $width,
+ $x1, $y1 + $width
+ );
+ $this->draw_polygon($points, null, $border_color, 1);
+ */
$this->draw_line($x1, $y1, $x1 + $width, $y1, $border_color, 1);
$this->draw_line($x1, $y1, $x1, $y1 + $height, $border_color, 1);
$this->draw_line($x1 + $width, $y1, $x1 + $width, $y1 + $height, $border_color, 1);
@@ -93,7 +100,11 @@ class bilde_swf_renderer extends bilde_renderer
public function draw_polygon($points, $body_color, $border_color = null, $border_width = 0)
{
$poly = new SWFShape();
- $poly->setLeftFill($body_color[0], $body_color[1], $body_color[2]);
+
+ if(!empty($body_color))
+ {
+ $poly->setLeftFill($body_color[0], $body_color[1], $body_color[2]);
+ }
if(!empty($border_color) && $border_width > 0)
{
$poly->setLine($border_width, $border_color[0], $border_color[1], $border_color[2]);
diff --git a/pts-core/options/run_test.php b/pts-core/options/run_test.php
index c0cdae2..d16d3bc 100644
--- a/pts-core/options/run_test.php
+++ b/pts-core/options/run_test.php
@@ -439,6 +439,7 @@ class run_test implements pts_option_interface
pts_user_message($PRE_RUN_MESSAGE);
}
+ // Run the actual tests
pts_recurse_call_tests($test_names_r, $test_arguments_r, $save_results, $xml_results_writer, $results_identifier, $test_arguments_description_r);
if(isset($POST_RUN_MESSAGE))