Summary
Description: Phoronix Test Suite open-source benchmarking development
Last Change: Fri 5/17/13 22:52
Recent Commits
>
--git a/pts-core/commands/webui.php b/pts-core/commands/webui.php
index cf58325..c7b144c 100644
--- a/pts-core/commands/webui.php
+++ b/pts-core/commands/webui.php
@@ -20,6 +20,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
+// chromium-browser --incognito --temp-profile --kiosk --app=
+
class webui implements pts_option_interface
{
const doc_skip = true; // TODO XXX: cleanup this code before formally advertising this...
@@ -28,7 +31,7 @@ class webui implements pts_option_interface
public static function run($r)
{
- return false; // This won't be formally ready for PTS 4.0 Suldal
+ //return false; // This won't be formally ready for PTS 4.0 Suldal
if(PHP_VERSION_ID < 50400)
{
echo 'Running an unsupported PHP version. PHP 5.4+ is required to use this feature.' . PHP_EOL . PHP_EOL;
@@ -40,8 +43,13 @@ class webui implements pts_option_interface
return false;
}
- $chrome = pts_client::executable_in_path('chromium-browser');
+ echo '<pre>';
+ echo 'Hardware:' . PHP_EOL . phodevi::system_hardware(true) . PHP_EOL . PHP_EOL;
+ echo 'Software:' . PHP_EOL . phodevi::system_software(true) . PHP_EOL . PHP_EOL;
+ echo '</pre>';
+ /*
+ $chrome = pts_client::executable_in_path('chromium-browser');
if($chrome)
{
$pid = pcntl_fork();
@@ -58,7 +66,8 @@ class webui implements pts_option_interface
{
echo shell_exec(getenv('PHP_BIN') . ' -S localhost:2300 test.php');
}
- }
+ }*/
+
}
}
diff --git a/pts-core/phoronix-test-suite.php b/pts-core/phoronix-test-suite.php
index d4313d0..e4fa6e6 100644
--- a/pts-core/phoronix-test-suite.php
+++ b/pts-core/phoronix-test-suite.php
@@ -41,6 +41,15 @@ if(!PTS_IS_CLIENT)
return;
}
+define('IS_PTS_WEB_INTERFACE', php_sapi_name() == 'cli-server');
+
+if(IS_PTS_WEB_INTERFACE == 'cli-server')
+{
+ $argv = array();
+ $argv[1] = 'webui';
+ $argc = count($argv);
+}
+
// Default to C locale
setlocale(LC_ALL, 'C');
@@ -82,7 +91,7 @@ $sent_command = strtolower(str_replace('-', '_', (isset($argv[1]) ? $argv[1] : n
$quick_start_options = array('dump_possible_options');
define('QUICK_START', in_array($sent_command, $quick_start_options));
-if(QUICK_START == false)
+if(QUICK_START == false && IS_PTS_WEB_INTERFACE == false)
{
pts_client::program_requirement_checks(true);
}
@@ -128,7 +137,7 @@ if(is_file(PTS_PATH . 'pts-core/commands/' . $sent_command . '.php') == false)
define('PTS_USER_LOCK', PTS_USER_PATH . 'run_lock');
-if(QUICK_START == false)
+if(QUICK_START == false && IS_PTS_WEB_INTERFACE == false)
{
if(pts_client::create_lock(PTS_USER_LOCK) == false)
{
@@ -149,7 +158,7 @@ for($i = 2; $i < $argc && isset($argv[$i]); $i++)
array_push($pass_args, $argv[$i]);
}
-if(QUICK_START == false)
+if(QUICK_START == false && IS_PTS_WEB_INTERFACE == false)
{
pts_client::user_agreement_check($sent_command);
pts_client::user_hardware_software_reporting();
diff --git a/pts-core/results-viewer/phoronix-test-suite.css b/pts-core/results-viewer/phoronix-test-suite.css
index b0a0115..5ebe444 100644
--- a/pts-core/results-viewer/phoronix-test-suite.css
+++ b/pts-core/results-viewer/phoronix-test-suite.css
@@ -20,8 +20,8 @@ div#pts_container
text-align: left;
min-width: 940px;
background: #FFF;
- width: 88%;
- margin: 30px auto;
+ width: auto;
+ margin: 60px;
overflow: hidden;
border: 1px solid #D7D7D7;
box-shadow: 1px 1px 4px #000;
<
Copyright © 2013 by Phoronix Media