summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-12-28 21:15:33 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-12-28 21:15:33 -0500
commit28643a2c1073642f86be8e506fefd8824770df61 (patch)
treed9128a1dfbf5a0ed2897736207b1f681e32b1c66
parent09ed23bf37c87617628c394bd7aff1bd54f73213 (diff)
downloadphoronix-test-suite-upstream-28643a2c1073642f86be8e506fefd8824770df61.zip
phoronix-test-suite-upstream-28643a2c1073642f86be8e506fefd8824770df61.tar.gz
phoronix-test-suite-upstream-28643a2c1073642f86be8e506fefd8824770df61.tar.xz
pts-core: When installing or running a test, only print to standard
output if under 10KB
-rw-r--r--CHANGE-LOG1
-rw-r--r--pts-core/functions/pts-functions-install.php8
-rw-r--r--pts-core/functions/pts-functions-run.php9
-rw-r--r--pts-core/objects/bilde_renderer/bilde_jpg_renderer.php2
4 files changed, 16 insertions, 4 deletions
diff --git a/CHANGE-LOG b/CHANGE-LOG
index ee8d0a1..f4ce9d4 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -12,6 +12,7 @@ Phoronix Test Suite (Git)
- 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-core: Add install-all-dependencies option to install all available external dependencies for that distribution
+- pts-core: When installing or running a test, only print to standard output if under 10KB
- 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: Add build-mysql test profile for timed build of MySQL 5.1
diff --git a/pts-core/functions/pts-functions-install.php b/pts-core/functions/pts-functions-install.php
index d2d08f8..21e94c5 100644
--- a/pts-core/functions/pts-functions-install.php
+++ b/pts-core/functions/pts-functions-install.php
@@ -426,11 +426,17 @@ function pts_install_test($identifier)
pts_user_message($pre_install_message);
- echo $install_log = pts_call_test_script($identifier, "install", null, TEST_ENV_DIR . $identifier . "/", pts_run_additional_vars($identifier), false);
+ $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);
+
+ if(strlen($install_log) < 10240)
+ {
+ // Not worth printing files over 10kb to screen
+ echo $install_log;
+ }
}
pts_user_message($post_install_message);
diff --git a/pts-core/functions/pts-functions-run.php b/pts-core/functions/pts-functions-run.php
index 4c74cd2..749d505 100644
--- a/pts-core/functions/pts-functions-run.php
+++ b/pts-core/functions/pts-functions-run.php
@@ -871,9 +871,14 @@ function pts_run_test($test_identifier, $extra_arguments = "", $arguments_descri
echo pts_string_header($test_title . " (Run " . ($i + 1) . " of " . $times_to_run . ")");
$result_output = array();
- echo $test_results = pts_exec("cd " . $to_execute . " && " . $execute_binary_prepend . "./" . $execute_binary . " " . $pts_test_arguments, $test_extra_runtime_variables);
+ $test_results = pts_exec("cd " . $to_execute . " && " . $execute_binary_prepend . "./" . $execute_binary . " " . $pts_test_arguments, $test_extra_runtime_variables);
- if(is_file($benchmark_log_file) && trim($test_results) == "")
+ if(strlen($test_results) < 10240)
+ {
+ echo $test_results;
+ }
+
+ if(is_file($benchmark_log_file) && trim($test_results) == "" && filesize($benchmark_log_file) < 10240)
{
echo file_get_contents($benchmark_log_file);
}
diff --git a/pts-core/objects/bilde_renderer/bilde_jpg_renderer.php b/pts-core/objects/bilde_renderer/bilde_jpg_renderer.php
index 6f1a5f1..7810f37 100644
--- a/pts-core/objects/bilde_renderer/bilde_jpg_renderer.php
+++ b/pts-core/objects/bilde_renderer/bilde_jpg_renderer.php
@@ -5,7 +5,7 @@
URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
Copyright (C) 2008, Phoronix Media
Copyright (C) 2008, Michael Larabel
- bilde_png_renderer: The PNG rendering implementation for bilde_renderer.
+ bilde_jpg_renderer: The JPEG rendering implementation for bilde_renderer.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by