Summary
Description: Phoronix Test Suite open-source benchmarking development
Last Change: Fri 5/17/13 22:52
Recent Commits
>
--git a/CHANGE-LOG b/CHANGE-LOG
index 0e1de00..030b107 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -7,6 +7,7 @@ Phoronix Test Suite (Git)
- pts-core: Fix for installing Ubuntu external dependencies in a headless mode
- pts-core: Disable webui since it won't be ready until PTS 4.2
- phodevi: Additional fall-back support when GPU driver doesn't expose all standard mode-setting modes
+- phodevi: Support for detecting and reading the version of the Cinnamon Desktop Environment
- timed_screenshot: Overhaul of the timed screenshot PTS module
- timed_screenshot: Compress PNG images
diff --git a/documentation/stubs/01_install.html b/documentation/stubs/01_install.html
index e32b111..94b6a46 100644
--- a/documentation/stubs/01_install.html
+++ b/documentation/stubs/01_install.html
@@ -28,7 +28,7 @@
<p>Major updates to the Phoronix Test Suite are released on a quarterly basis. The latest stable and development versions of the Phoronix Test Suite are available at <a href="http://www.phoronix-test-suite.com/">Phoronix-Test-Suite.com</a>. The Git repository where the latest Phoronix Test Suite code is provided is hosted at <a href="http://www.phorogit.com/">Phorogit.com</a> and can be cloned/pulled from the <em>http://www.phorogit.com/repo/phoronix-test-suite.git</em> repository. The latest upstream development code is housed in the master tree while older Phoronix Test Suite releases are available in their respective Git branches based upon the release's code-name.</p>
<p>If building the PHP package from upstream sources, it should just be a matter of running <em>./configure</em> with the <em>--enable-zip</em> flag (all other requirements should be apart of the stock PHP configuration) to satisfy the PHP needs of the Phoronix Test Suite.</p>
<h2>File Structure</h2>
-<p>If manually changing the location of the <em>phoronix-test-suite</em> launcher file, the <em>PTS_USER_PATH</em> environmental variable must be adjusted inside the file to reflect the absolute location that leads to the root directory of the <em>pts</em> and <em>pts-core</em> folders. The <em>pts-core</em> directory contains the "engine" of the Phoronix Test Suite.</p>
+<p>If manually changing the location of the <em>phoronix-test-suite</em> launcher file, the <em>PTS_USER_PATH</em> environment variable must be adjusted inside the file to reflect the absolute location that leads to the root directory of the <em>pts</em> and <em>pts-core</em> folders. The <em>pts-core</em> directory contains the "engine" of the Phoronix Test Suite.</p>
<h2>Running Locally</h2>
<p>The Phoronix Test Suite can be simply extracted from the downloaded <em>.tar.gz</em> or <em>.zip</em> file or it can also be installed system-wide. If you just wish to run the Phoronix Test Suite without installing it, open a terminal and run <em>./phoronix-test-suite <options></em> from the same directory.</p>
<h2>Generic Installation</h2>
diff --git a/documentation/stubs/40_configuration.html b/documentation/stubs/40_configuration.html
index ec53ba2..359bdbf 100644
--- a/documentation/stubs/40_configuration.html
+++ b/documentation/stubs/40_configuration.html
@@ -20,7 +20,7 @@
<p>This is the directory where test profiles are stored.</p>
<p><strong>~/.phoronix-test-suite/test-suites/</strong></p>
<p>This is the directory where test suites are stored.</p>
-<h1>Environmental Variables</h1>
+<h1>Environment Variables</h1>
<p><strong>TEST_RESULTS_NAME</strong></p>
<p>When this variable is set, the value will be used as the name for automatically saving the test results.</p>
<p><strong>TEST_RESULTS_IDENTIFIER</strong></p>
@@ -28,7 +28,7 @@
<p><strong>TEST_RESULTS_DESCRIPTION</strong></p>
<p>When this variable is set, the value will be used as the test results description when saving the test results.</p>
<p><strong>PRESET_OPTIONS</strong></p>
-<p>For setting any test option(s) from an environmental variable rather than being prompted for the options when running a test. Example: <em>PRESET_OPTIONS="stream.run-type=Add" ./phoronix-test-suite benchmark stream</em></p>
+<p>For setting any test option(s) from an environment variable rather than being prompted for the options when running a test. Example: <em>PRESET_OPTIONS="stream.run-type=Add" ./phoronix-test-suite benchmark stream</em></p>
<p><strong>SKIP_TESTS</strong></p>
<p>If there are any test(s) to exempt from the testing process, specify them in this variable. Multiple tests can be waived by delimiting each test identifier by a comma. A test hardware type (i.e. Graphics) can also be supplied for skipping a range of tests.</p>
<p><strong>PTS_MODULE_SETUP</strong></p>
@@ -64,6 +64,6 @@
<p><strong>DEFAULT_VIDEO_MODE</strong></p>
<p>If Phodevi fails to detect the system's monitor standard / default resolution, the mode can be specified in this variable. Example: <em>DEFAULT_VIDEO_MODE=1680x1050 phoronix-test-suite benchmark nexuiz</em>.</p>
<p><strong>SKIP_EXTERNAL_DEPENDENCIES</strong></p>
-<p>To skip the Phoronix Test Suite external dependency checking/installation when installing a test, set this environmental variable to <em>1</em>. If wishing to skip only certain external dependencies, set this variable's value to the name of the external dependencies (the generic dependency names used by the Phoronix Test Suite) to not install. Multiple dependencies to skip can be delimited by a comma.</p>
+<p>To skip the Phoronix Test Suite external dependency checking/installation when installing a test, set this environment variable to <em>1</em>. If wishing to skip only certain external dependencies, set this variable's value to the name of the external dependencies (the generic dependency names used by the Phoronix Test Suite) to not install. Multiple dependencies to skip can be delimited by a comma.</p>
</body>
</html>
diff --git a/documentation/stubs/50_general_information.html b/documentation/stubs/50_general_information.html
index 99ca5e8..4fe8781 100644
--- a/documentation/stubs/50_general_information.html
+++ b/documentation/stubs/50_general_information.html
@@ -27,12 +27,12 @@
<p>- When running a test where you are prompted to enter any test options, multiple selections can be performed -- which will result in multiple test runs for each combination of the selected option(s) -- by separating each intended test option / number with a comma.</p>
<p>- When being prompted for the test identifier or the file name for saving the results, several user variables are supported. These include <em>$VIDEO_RESOLUTION</em>, <em>$VIDEO_CARD</em>, <em>$OPERATING_SYSTEM</em>, <em>$PROCESSOR</em>, <em>$MOTHERBOARD</em>, <em>$CHIPSET</em>, and <em>$KERNEL_VERSION</em>. If any of these variables are entered, the Phoronix Test Suite will replace them with their respective values before saving the results.</p>
<p>- If <em>RemoveDownloadFiles</em> is set to <em>TRUE</em> within the <em>user-config.xml</em> file, once a test has been installed the originally downloaded files for that test will be automatically removed. This conserves disk space but will cause these files to be re-downloaded the next time the test needs to be re-installed. This will also not back up the downloaded files to the Phoronix Test Suite download cache. Enabling this option is just recommended for users with very limited disk space.</p>
-<p>- If the amount of video memory for your graphics card is incorrectly reported by the Phoronix Test Suite (you can check by running <em>phoronix-test-suite diagnostics</em>), you can use the <em>VIDEO_MEMORY=</em> environmental variable for overriding the video memory capacity (in Megabytes) used by the Phoronix Test Suite.</p>
-<p>- If the <em>DISPLAY</em> environmental variable is not set or <em>NO_GRAPHICS_TESTS</em> environmental variable is set, tests of type <em>Graphics</em> will not be run. Likewise, if <em>NO_SYSTEM_TESTS</em> environmental variable is set, tests of type <em>System</em> will not run. This applies to all test types where <em>NO_<TEST TYPE>_TESTS</em> is set.</p>
+<p>- If the amount of video memory for your graphics card is incorrectly reported by the Phoronix Test Suite (you can check by running <em>phoronix-test-suite diagnostics</em>), you can use the <em>VIDEO_MEMORY=</em> environment variable for overriding the video memory capacity (in Megabytes) used by the Phoronix Test Suite.</p>
+<p>- If the <em>DISPLAY</em> environment variable is not set or <em>NO_GRAPHICS_TESTS</em> environment variable is set, tests of type <em>Graphics</em> will not be run. Likewise, if <em>NO_SYSTEM_TESTS</em> environment variable is set, tests of type <em>System</em> will not run. This applies to all test types where <em>NO_<TEST TYPE>_TESTS</em> is set.</p>
<p>- If while running multiple tests you want to quit the testing prematurely, in a new terminal window type <em>touch ~/.phoronix-test-suite/halt-testing</em>. All results for tests that had already run will be saved (permitting you opted to save the results), except for the test currently being run.</p>
<p>- If you wish to stop the current test run prematurely but continue the testing process, in a new terminal window type <em>touch ~/.phoronix-test-suite/skip-test</em>.</p>
-<p>- If you want the specified test(s) to run in a loop for a set period of time, use the <em>TOTAL_LOOP_TIME</em> environmental variable. For instance, running <em>TOTAL_LOOP_TIME=120 phoronix-test-suite benchmark ffmpeg</em> would keep running the ffmpeg test profile for 120 minutes.</p>
-<p>- If you want the specified test(s) to run in a loop for a set number of times, use the <em>TOTAL_LOOP_COUNT</em> environmental variable. For instance, running <em>TOTAL_LOOP_COUNT=3 phoronix-test-suite benchmark ffmpeg</em> would keep running the ffmpeg test profile three times.</p>
+<p>- If you want the specified test(s) to run in a loop for a set period of time, use the <em>TOTAL_LOOP_TIME</em> environment variable. For instance, running <em>TOTAL_LOOP_TIME=120 phoronix-test-suite benchmark ffmpeg</em> would keep running the ffmpeg test profile for 120 minutes.</p>
+<p>- If you want the specified test(s) to run in a loop for a set number of times, use the <em>TOTAL_LOOP_COUNT</em> environment variable. For instance, running <em>TOTAL_LOOP_COUNT=3 phoronix-test-suite benchmark ffmpeg</em> would keep running the ffmpeg test profile three times.</p>
<p>- When any tests are being installed and when tests are being run, a lock is created in the system's temporary directory with the name <em>phoronix-test-suite.active</em> (i.e. <em>/tmp/phoronix-test-suite.active</em>) and is removed upon completion. Thus if you have any system scripts that you wish to run when tests are not running or being installed as to not impact the results, one simple way to handle this is by having the script check for the existence of this lock.</p>
<h2>Configuration</h2>
<p>- The user configuration options for the Phoronix Test Suite are stored in <em>~/.phoronix-test-suite/user-config.xml</em>. The batch mode options are also stored within this file and those can be adjusted by running <em>phoronix-test-suite batch-setup</em>.</p>
diff --git a/pts-core/objects/phodevi/components/phodevi_system.php b/pts-core/objects/phodevi/components/phodevi_system.php
index b1360a7..964d5d9 100644
--- a/pts-core/objects/phodevi/components/phodevi_system.php
+++ b/pts-core/objects/phodevi/components/phodevi_system.php
@@ -1031,6 +1031,11 @@ class phodevi_system extends phodevi_device_interface
$desktop_version = substr($openbox_output, 0, strpos($openbox_output, PHP_EOL));
}
}
+ else if(pts_client::is_process_running('cinnamon'))
+ {
+ $desktop_environment = 'Cinnamon';
+ $desktop_version = pts_strings::last_in_string(trim(shell_exec('cinnamon --version 2> /dev/null')));
+ }
if(!empty($desktop_environment))
{
diff --git a/pts-core/static/xsl/pts-user-config-viewer.xsl b/pts-core/static/xsl/pts-user-config-viewer.xsl
index 6ce9435..d25298b 100644
--- a/pts-core/static/xsl/pts-user-config-viewer.xsl
+++ b/pts-core/static/xsl/pts-user-config-viewer.xsl
@@ -28,7 +28,7 @@
<h1>Modules Options</h1>
<h3>LoadModules: <span style="color: #CC0000;"><xsl:value-of select="PhoronixTestSuite/Options/Modules/LoadModules" /></span></h3>
- <p>This tag contains a string of the names of the Phoronix Test Suite modules to load by default when running the Phoronix Test Suite. Multiple modules can be listed when delimited by a comma. Modules that load via setting an environmental variable can also be specified here (i.e. <em>FORCE_AA=8</em> as an option in this string to load the <em>graphics_override</em> module with the 8x forced anti-aliasing). The default value is <em>toggle_screensaver, update_checker</em>.</p>
+ <p>This tag contains a string of the names of the Phoronix Test Suite modules to load by default when running the Phoronix Test Suite. Multiple modules can be listed when delimited by a comma. Modules that load via setting an environment variable can also be specified here (i.e. <em>FORCE_AA=8</em> as an option in this string to load the <em>graphics_override</em> module with the 8x forced anti-aliasing). The default value is <em>toggle_screensaver, update_checker</em>.</p>
<h1>Installation Options</h1>
<h3>RemoveDownloadFiles: <span style="color: #CC0000;"><xsl:value-of select="PhoronixTestSuite/Options/Installation/RemoveDownloadFiles" /></span></h3>
@@ -91,7 +91,7 @@
<h3>Timeout: <span style="color: #CC0000;"><xsl:value-of select="PhoronixTestSuite/Options/Networking/Timeout" /></span></h3>
<p>This is the read timeout (in seconds) for network connections. The default value is <em>20</em>.</p>
<h3>ProxyAddress: <span style="color: #CC0000;"><xsl:value-of select="PhoronixTestSuite/Options/Networking/ProxyAddress" /></span></h3>
- <p>If you wish to use a HTTP proxy server to allow the Phoronix Test Suite to communicate with OpenBenchmarking.org and other web services, enter the IP address / server name of the proxy server in this tag. If the proxy address and port tags are left empty but the <em>http_proxy</em> environmental variable is set, the Phoronix Test Suite will attempt to use that as the proxy information.</p>
+ <p>If you wish to use a HTTP proxy server to allow the Phoronix Test Suite to communicate with OpenBenchmarking.org and other web services, enter the IP address / server name of the proxy server in this tag. If the proxy address and port tags are left empty but the <em>http_proxy</em> environment variable is set, the Phoronix Test Suite will attempt to use that as the proxy information.</p>
<h3>ProxyPort: <span style="color: #CC0000;"><xsl:value-of select="PhoronixTestSuite/Options/Networking/ProxyPort" /></span></h3>
<p>If using a proxy server, enter the TCP port in this tag.</p>
<
Copyright © 2013 by Phoronix Media