Phoronix Test Suite 6.6.1

phoromatic: Additional UI tweaks

AUTHORS

@@ -1,8 +1,8 @@
-Copyright 2008 - 2015 by Phoronix Media.
+Copyright 2008 - 2016 by Phoronix Media.
 
 Lead Architects:
 
 - Michael Larabel <michael@phoronix.com>
 - Matthew Tippett <matthew@phoronix.com>
 
-There's also other individuals and organizations who have contributed patches, ideas, and made other contributions to the Phoronix Test Suite. These names are mentioned in the HTML / PDF documentation.
+There's also other individuals and organizations who have contributed patches, ideas, and made other contributions to the Phoronix Test Suite.

README.md

@@ -1,8 +1,8 @@
-# Phoronix Test Suite 5.8.0
+# Phoronix Test Suite 6.6.1
 http://www.phoronix-test-suite.com/
 
 The **Phoronix Test Suite** is the most comprehensive testing and benchmarking
-platform available for Linux, Solaris, Mac OS X, and BSD operating systems. The
+platform available for Linux, Solaris, OS X, and BSD operating systems. The
 Phoronix Test Suite allows for carrying out tests in a fully automated manner
 from test installation to execution and reporting. All tests are meant to be
 easily reproducible, easy-to-use, and support fully automated execution. The
@@ -27,7 +27,7 @@ able to upload their test results, profiles, and suites to OpenBenchmarking.org.
 A test profile is a single test that can be executed by the Phoronix Test Suite
 -- with a series of options possible within every test -- and a test suite is a
 seamless collection of test profiles and/or additional test suites. A test
-profile consists of a set of bash/shell scripts and XML files while a test suite
+profile consists of a set of Bash/shell scripts and XML files while a test suite
 is a single XML file.
 
 [OpenBenchmarking.org](http://www.openbenchmarking.org/) also allows for
@@ -46,9 +46,9 @@ Phoromatic, and OpenBenchmarking.org is available by contacting
 
 Full details on the Phoronix Test Suite setup and usage is available from the
 included HTML/PDF documentation within the phoronix-test-suite package and from
-the Phoronix Test Suite web-site.
+the Phoronix Test Suite website.
 
-## INSTALLATION & SETUP:
+## Installation & Setup
 
 The Phoronix Test Suite is supported on Linux, *BSD, Solaris, Mac OS X, and
 Windows systems. However, the most full-featured and well supported operating
@@ -61,11 +61,11 @@ architectures.
 The Phoronix Test Suite can be installed for system-wide usage or run locally
 without installation from the extracted tar.gz/zip package. The only hard
 dependency on the Phoronix Test Suite is having command-line support for PHP
-(PHP 5.2+) installed. A complete PHP stack (e.g. with web-server) is NOT needed,
-but merely the PHP command-line support, which is widely available from
+(PHP 5.3+) installed. A complete PHP stack (e.g. with web server) is **not**
+needed, but merely the PHP command-line support, which is widely available from
 operating system package managers under the name `php`, `php5-cli`, or `php5`.
 
-## USAGE:
+## Usage
 
 The process to download, install/setup, execute, and report the results of a
 benchmark can be as simple as a command such as `phoronix-test-suite benchmark
@@ -84,7 +84,7 @@ running, for example, `phoronix-test-suite benchmark 1204293-BY-PHORONIX357` if
 wishing to compare the results of the
 `http://openbenchmarking.org/result/1204293-BY-PHORONIX357` result file.
 
-Additional information is available from the Phoronix Test Suite web-site
+Additional information is available from the Phoronix Test Suite website
 <http://www.phoronix-test-suite.com/> and the material bundled within the
 `phoronix-test-suite/documentation/` directory. A man page is also bundled with
 the phoronix-test-suite software.

deploy/deb-package/build-package-deb.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2015, Phoronix Media
-	Copyright (C) 2008 - 2015, Michael Larabel
+	Copyright (C) 2008 - 2016, Phoronix Media
+	Copyright (C) 2008 - 2016, Michael Larabel
 
 	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
@@ -23,7 +23,7 @@
 if(!is_executable("phoronix-test-suite") || !is_dir("pts-core/"))
 {
 	echo "\nYou must run this script from the root directory of the phoronix-test-suite/ folder!\n";
-	echo "Example: php5 deploy/deb-package/build-package-deb.php\n";
+	echo "Example: php deploy/deb-package/build-package-deb.php\n";
 	exit(0);
 }
 if(!is_executable('/usr/bin/dpkg'))
@@ -63,8 +63,8 @@ $control_file .= "Section: Utilities\n";
 $control_file .= "Installed-Size: " . shell_exec("cd /tmp/pts-deb-builder/; du -s | cut -f 1");
 $control_file .= "Priority: optional\n";
 $control_file .= "Architecture: all\n";
-$control_file .= "Depends: php5-cli, php5-gd, php5-json\n";
-$control_file .= "Recommends: build-essential\n";
+$control_file .= "Depends: php-cli|php5-cli,php5-xml|php-xml\n";
+$control_file .= "Recommends: build-essential, php-gd|php5-gd\n";
 $control_file .= "Maintainer: Phoronix Media <trondheim-pts@phoronix-test-suite.com>\n";
 $control_file .= "Description: An Automated, Open-Source Testing Framework\n " . @str_replace("\n", " ", file_get_contents('pts-core/static/short-description.txt')) . "\n";
 $control_file .= "Homepage: http://www.phoronix-test-suite.com/ \n";

deploy/farm-system-customizations/intel-xorg-headless.conf

@@ -12,6 +12,7 @@ Section "Device"
         Option "Virtualheads" "1"
         Option "Vsync" "0"
         Option "SwapbuffersWait" "0"
+	Option "DRI" "3"
 EndSection
 
 Section "Screen"

deploy/farm-system-customizations/radeon-xorg-headless.conf

@@ -2,6 +2,7 @@ Section "Device"
     Identifier             "Device0"
     Driver                 "radeon"
 	Option "SwapBuffersWait" "0"
+		Option "DRI "3"
 EndSection
 
 Section "Monitor"

deploy/juju/trusty/pts/actions/benchmark

@@ -3,8 +3,6 @@
 set -e
 
 run_benchmark() {
-    chlp benchmark-start || true
-
     params="$@"
 
     mkdir -p /opt/pts/results
@@ -20,9 +18,10 @@ run_benchmark() {
 
     phoronix-test-suite batch-install $params > /dev/null 2>&1
 
+    benchmark-start || true
     phoronix-test-suite batch-run $params
+    benchmark-finish || true
     rsync -aqz /root/.phoronix-test-suite /opt/pts/results/$run
 
     scripts/parse /opt/pts/results/$run/.phoronix-test-suite/test-results/$(date +%Y)-*/test-1.xml
-    chlp benchmark-finish || true
 }

deploy/juju/trusty/pts/hooks/phoronix-common

@@ -110,6 +110,9 @@ install_phoronix() {
   apt-get install -qqy unzip build-essential default-jre-headless mesa-utils
   apt-get install -qqy phoronix-test-suite
 
+  apt-get install -qqy python python-pip
+  pip install --upgrade charms.benchmark
+
   # puppet helper to distribute facts between scripts
   apt-get install -qqy facter-customfacts-plugin
 

documentation/TODO

@@ -8,23 +8,27 @@ PHORONIX TEST SUITE PUBLIC TODO LIST:
 - Support for multiple languages / internationalization.
 - BLKID fall-back support for determining file-system [e.g. /sbin/blkid -s TYPE -o value /dev/sda1].
 - Possibly restore "weighted suites" [http://phorogit.com/index.php?p=phoronix-test-suite.git&a=commitdiff&h=548e5c073cc90d92ac3f382ca4933d5f556e78c6&hb=444441f9be866f51920e0ad8ca3909951b4d90c5]
-- Integrate recover-run command into the run command, auto-detect if the result file was a partial save and then ask if to perform run recovery' [ POSSIBLY DO THE SAME FOR FINISH-RUN]
+- Integrate finish-run command into the run command, auto-detect if the result file was a partial save and then ask if to perform run recovery'
 - Multi-threaded downloading of test files
-- Numerous pts_render improvements [see in-line code comments]
 - Optimus / DRI_PRIME=1 / xrandr --listproviders better GPU detection
 - NVIDIA make use of UsedDedicatedGPUMemory as new GPU sensor
 - Clean up all the WebSocket code and make it fit to spec
+- Incremental result uploads support
+- Check with Phodevi's parsers what other tools support JSON outputs - e.g. http://karelzak.blogspot.com/2015/06/json-output-for-basic-tools.html for cleaner parsing
+
+- Figure out why TestClientVersion in result file XML is missing after adding multiple systems, the previous ones are then blank
+- Restore the ReferenceID support in the results XML
+- Improve titles on tables like in: http://openbenchmarking.org/result/1603172-GA-AMDTONGA973
 
 ### PTS-GRAPH ###
 
 - Rotated text alignment for some PNG graphixs is sometimes off by 90/180 degrees compared to SVG, e.g. http://openbenchmarking.org/s/Compiler
-- SVG graph improvements
 
 ### OPENBENCHMARKING.ORG ###
 
 - Shorten long change-logs on test profile pages - e.g. http://openbenchmarking.org/test/pts/hpcc
 
-### NEW TEST PROFILES ###
+### POSSIBLE NEW TEST PROFILES ###
 
 - Python-libmemcached [http://code.google.com/p/python-libmemcached/]
 - Intel HiBench [https://github.com/intel-hadoop/HiBench]
@@ -39,7 +43,9 @@ PHORONIX TEST SUITE PUBLIC TODO LIST:
 - http://hashcat.net/oclhashcat/
 - Handbrake [http://handbrake.fr/]
 - libMicro [https://github.com/portante/libMicro]
+- http://markjstock.org/pages/rad_bench.html
 - https://code.google.com/p/pyrit/
+- https://github.com/acangiano/ruby-benchmark-suite
 - http://www.nwchem-sw.org/index.php/Compiling_NWChem
 - http://sourceforge.net/projects/ffsb/
 - http://www.ratgpu.com/
@@ -50,12 +56,25 @@ PHORONIX TEST SUITE PUBLIC TODO LIST:
 - http://www.capsl.udel.edu/splash/Download.html
 - https://github.com/facebook/linkbench
 - https://github.com/vasi/pixz
+- stephentu/silo
 - http://nondot.org/sabre/LLVMNotes/#benchmarks
+- https://code.google.com/p/smhasher/wiki/SMHasher
 - http://benchmarksgame.alioth.debian.org/u32/performance.php?test=fasta / http://benchmarksgame.alioth.debian.org/u32/program.php?test=nbody&lang=gcc&id=1#sourcecode
 - https://openfoamwiki.net/index.php/Benchmarks_standard_v1
 - Cassandra 1.2 stress - http://docs.datastax.com/en/cassandra/1.2/cassandra/tools/toolsCStress_t.html
 - http://gcc.opensuse.org/c++bench-frescobaldi/
-
+- http://dacapobench.org/
+- https://github.com/GoogleCloudPlatform/PerfKitBenchmarker
+- https://gooseberry.blender.org/gooseberry-production-benchmark-file/
+- https://github.com/hhvm/oss-performance
+- https://github.com/gormanm/mmtests
+- https://github.com/pandegroup/fahbench
+- https://github.com/STH-Dev/linux-bench
+- http://anzwix.com/a/FFmpeg/CryptobenchAddSupportForBlowfish
+- https://wiki.mikejung.biz/Benchmarking
+- http://dacapobench.org/
+- https://github.com/soumith/convnet-benchmarks
+- https://github.com/cavazos-lab/FinanceBench
 
 ### WEB SOCKET / HTML5 USER INTERFACE WORK ###
 
@@ -68,7 +87,6 @@ PHORONIX TEST SUITE PUBLIC TODO LIST:
 ### PHOROMATIC ####
 
 - Implement the complementary WebSocket communication to HTTP pulls
-- More mobile form factor optimizations
 - Ensure sane validating of more user input / resource uploads
 - Hook up TriggerTarget for allowing event.php to optionally specify a sub-set of systems/groups to target for a given trigger
 - Clean up the code and modularize more of the code into functions

documentation/man-pages/phoronix-test-suite.1

@@ -1,4 +1,4 @@
-.TH phoronix-test-suite 1  "www.phoronix-test-suite.com" "5.8.0"
+.TH phoronix-test-suite 1  "www.phoronix-test-suite.com" "6.6.1"
 .SH NAME
 phoronix-test-suite \- The Phoronix Test Suite is an extensible open-source platform for performing testing and performance evaluation.
 .SH SYNOPSIS
@@ -6,7 +6,7 @@ phoronix-test-suite \- The Phoronix Test Suite is an extensible open-source plat
 .br
 .B phoronix-test-suite benchmark [test | suite]
 .SH DESCRIPTION
-The **Phoronix Test Suite** is the most comprehensive testing and benchmarking platform available for Linux, Solaris, Mac OS X, and BSD operating systems. The Phoronix Test Suite allows for carrying out tests in a fully automated manner from test installation to execution and reporting. All tests are meant to be easily reproducible, easy-to-use, and support fully automated execution. The Phoronix Test Suite is open-source under the GNU GPLv3 license and is developed by Phoronix Media in cooperation with partners.
+The **Phoronix Test Suite** is the most comprehensive testing and benchmarking platform available for Linux, Solaris, OS X, and BSD operating systems. The Phoronix Test Suite allows for carrying out tests in a fully automated manner from test installation to execution and reporting. All tests are meant to be easily reproducible, easy-to-use, and support fully automated execution. The Phoronix Test Suite is open-source under the GNU GPLv3 license and is developed by Phoronix Media in cooperation with partners.
 .SH OPTIONS
 .TP
 .SH TEST INSTALLATION
@@ -68,7 +68,7 @@ This option and its arguments pre-set the Phoronix Test Suite batch run mode wit
 .TP
 .SH OPENBENCHMARKING.ORG
 .B clone-result [OpenBenchmarking ID]  ...
-This option will download a local copy of a file that was saved to OpenBenchmarking.org, as long as a valid public ID is supplied. More than one ID can be specified and the results will then be merged.
+This option will download a local copy of a file that was saved to OpenBenchmarking.org, as long as a valid public ID is supplied.
 .TP
 .B list-recommended-tests
 This option will list recommended test profiles for benchmarking sorted by hardware sub-system. The recommended tests are determined via querying OpenBenchmarking.org and determining the most popular tests for a given environment based upon the number of times a test profile has been downloaded, the number of test results available on OpenBenchmarking.org for a given test profile, the age of the test profile, and other weighted factors.
@@ -110,6 +110,9 @@ This option will print information that is useful to developers when debugging p
 .B interactive
 A simple text-driven interactive interface to the Phoronix Test Suite.
 .TP
+.B php-conf
+This option will print information that is useful to developers when debugging problems with the Phoronix Test Suite and/or test profiles and test suites.
+.TP
 .B system-info
 Display the installed system hardware and software information as detected by the Phoronix Test Suite Phodevi Library.
 .TP
@@ -141,6 +144,9 @@ This option will list all test profiles that are currently installed on the syst
 .B list-missing-dependencies
 This option will list all of the packages / external test dependencies that are missing from the system that the Phoronix Test Suite may potentially need by select test profiles.
 .TP
+.B list-not-installed-tests
+This option will list all test profiles that are supported and available but presently NOT installed on the system.
+.TP
 .B list-possible-dependencies
 This option will list all of the packages / external test dependencies that are are potentially used by the Phoronix Test Suite.
 .TP
@@ -160,7 +166,7 @@ This option is intended for use by test profile writers and is identical to the
 .B debug-install [Test | Suite | OpenBenchmarking.org ID | Test Result]  ...
 This option is intended for use by test profile writers and is identical to the install option but will yield more information during the run process that can be used to debug issues with a test profile installer or to verify the test profile is functioning correctly.
 .TP
-.B debug-test-download-links [Test | Suite]
+.B debug-test-download-links [Test | Suite | OpenBenchmarking.org ID | Test Result]
 This option will check all download links within the specified test profile(s) to ensure there are no broken URLs.
 .TP
 .B download-test-files [Test | Suite | OpenBenchmarking.org ID | Test Result]  ...
@@ -185,9 +191,6 @@ This option can be used for validating a Phoronix Test Suite test suite as being
 .B auto-sort-result-file [Test Result]
 This option is used if you wish to automatically attempt to sort the results by their result identifier string.
 .TP
-.B copy-run-in-result-file [Test Result]
-This option is used if you wish to change an existing test run within a saved results file.
-.TP
 .B edit-result-file [Test Result]
 This option is used if you wish to edit the title and description of an existing result file.
 .TP
@@ -234,16 +237,16 @@ Open up the test results in the Phoronix Test Suite Result Viewer or on OpenBenc
 .B analyze-all-runs [Test Result]
 This option will generate a candlestick graph showing the distribution of results from all trial runs. The candlestick graph is similar to the Japanese candlestick charts used by the financial industry, except instead of representing stock data it is numerical result data from all trial runs.\n\nThe tip of the upper-wick represents the highest value of the test runs with the tip of the lower-wick representing the lowest value of all test runs. The upper-edge of the candle body represents the first or last run value and the lower-edge represents the first or last run value. Lastly, if the last run value is less than the first run value, the candle body is the same color as the graph background, otherwise the last run value is greater.
 .TP
-.B analyze-batch [Test Result]
-This option will analyze a batch results file and plot out the performance impact from the different options onto a line graph (i.e. to see the impact that changing the video resolution has on the system's performance).
-.TP
-.B analyze-image-delta [Test Result]
-This option will analyze a test result file if it contains any test results that produced an image quality comparison (IQC) and will render image deltas illustrating the difference between images from two test results.
-.TP
 .SH OTHER
 .B build-suite
 This option will guide the user through the process of generating their own test suite, which they can then run. Optionally, passed as arguments can be the test(s) or suite(s) to add to the suite to be created, instead of being prompted through the process.
 .TP
+.B debug-dependency-handler
+This option is used for testing the distribution-specific dependency handler for external dependencies.
+.TP
+.B debug-render-test
+This option is used during the development of the Phoronix Test Suite software for testing of the result and graph rendering code-paths This option will download a large number of reference test results from LinuxBenchmarking.com.
+.TP
 .B debug-self-test
 This option is used during the development of the Phoronix Test Suite software for testing of internal interfaces, commands, and other common code-paths. The produced numbers should only be comparable for the same version of the Phoronix Test Suite, on the same hardware/software system, conducted on the same day of testing. This isn't intended as any scientific benchmark but simply to stress common PHP code-paths and looking for hot areas to optimize, etc.
 .TP
@@ -256,9 +259,6 @@ This option will display the list of available Phoronix Test Suite commands.
 .B network-setup
 This option allows the user to configure how the Phoronix Test Suite connects to OpenBenchmarking.org and other web-services. Connecting through an HTTP proxy can be configured through this option.
 .TP
-.B rebuild-composite-xml [Test Result]
-This option can be used to rebuild your composite XML file in the event that the main result file was corrupted and the test-X.xml files are still present in the result file directory.
-.TP
 .B user-config-reset
 This option can be used for resetting the Phoronix Test Suite user configuration file to its default state.
 .TP
@@ -308,5 +308,5 @@ http://www.phoronix.com/
 .br
 http://www.phoronix.com/forums/
 .SH AUTHORS
-Copyright 2008 - 2015 by Phoronix Media, Michael Larabel.
+Copyright 2008 - 2016 by Phoronix Media, Michael Larabel.
 .TP

documentation/stubs/01_install.html

@@ -5,10 +5,12 @@
 <body>
 <h1>Setup Overview</h1>
 <p>The Phoronix Test Suite supports Linux, Apple Mac OS X, Microsoft Windows, Solaris, Hurd, BSD, and other operating system environments. The only Linux distribution-specific code deals with the external dependencies support feature that are set by individual test profiles. If you are not running one of the supported Linux distributions, Solaris, BSD, or Mac OS X, you may need to install a package manually (as instructed by the Phoronix Test Suite) in order for a test to run. An example of an external dependency would be GCC and the OpenGL Utility Toolkit being needed for test profiles that build an OpenGL benchmark from source-code.</p>
-<p>Among the distributions where the Phoronix Test Suite has been officially tested include Ubuntu, Fedora, Mandriva / Mageia, Gentoo, PCLinuxOS, Arch Linux, Pardus, OpenSuSE, Optware, webOS, Zenwalk, CentOS, Red Hat Enterprise Linux, Oracle Linux, Scientific Linux, Debian, Mint, MEPIS, and Amazon Linux EC2.</p>
+<p>Among the distributions where the Phoronix Test Suite has been officially tested include Ubuntu, Fedora, Mandriva / Mageia, Gentoo, PCLinuxOS, Arch Linux, Pardus, OpenSuSE, Optware, webOS, Zenwalk, CentOS, Red Hat Enterprise Linux, Oracle Linux, Scientific Linux, Debian, Mint, MEPIS, Alpine Linux, Void Linux, Intel Clear Linux, and Amazon Linux EC2.</p>
 <p>Among the tested BSD distributions are FreeBSD, PC-BSD, NetBSD, OpenBSD, Debian GNU/kFreeBSD, and DragonflyBSD. Tested Solaris distributions include OpenSolaris, Solaris Express 11, Oracle Solaris 11, OpenIndiana, Illumos, and Nexenta.</p>
 <h1>Dependencies</h1>
-<p>The only required dependency for the Phoronix Test Suite is PHP 5.2 or newer. On Linux distributions, the needed package is commonly called <em>php5-cli</em> or <em>php-cli</em> or <em>php</em>. It is important to note that only PHP for the command-line is needed and not a web server (Apache) or other packages commonly associated with PHP and its usage by web-sites. The PHP5 version required is PHP 5.2+ and can also be found at <a href="http://www.php.net/">www.php.net</a>.</p>
+<p>The only required dependency for the Phoronix Test Suite is PHP 5.3 or newer. On Linux distributions, the needed package is commonly called <em>php5-cli</em> or <em>php-cli</em> or <em>php</em>. It is important to note that only PHP for the command-line is needed and not a web server (Apache) or other packages commonly associated with PHP and its usage by web-sites. The PHP5 version required is PHP 5.3+ and can also be found at <a href="http://www.php.net/">www.php.net</a>.</p>
+
+<p>For installing PHP on Windows, the <a href="https://www.microsoft.com/web/platform/phponwindows.aspx">Microsoft Web Platform Installer</a> provides an automated alternative that will install PHP into the directory expected by Phoronix Test Suite. Users opting to install PHP manually must extract the files to <em>C:\Program Files (x86)\PHP\</em> or a subdirectory.</p>
 <p>As part of the PHP requirement, the following PHP extensions are required and/or highly recommended in order to take advantage of the Phoronix Test Suite capabilities:</p>
 <ul>
 <li><strong>PHP DOM</strong> is needed for XML operations and must be installed for the Phoronix Test Suite to function.</li>
@@ -46,14 +48,17 @@
 <h2>OpenSolaris Installation</h2>
 <p>The Phoronix Test Suite core (pts-core) is supported on Solaris and OpenSolaris platforms, but some features may not fully function. Additionally, the PTS External Dependencies feature is supported on OpenSolaris using IPS (the Image Packaging System). However, not all test profiles are supported on Solaris / OpenSolaris, and it may be in violation of your end-user agreement to perform such benchmarks on the Sun Solaris operating system. Using the OpenSolaris Image Packaging System, installing <em>SUNWphp524</em> will provide PHP, PHP GD, and related dependencies. The Phoronix Test Suite has also been tested on Oracle Solaris 11 Express, OpenIndiana, StormOS, and Nexenta Core Platform.</p>
 <h2>BSD Installation</h2>
-<p>The Phoronix Test Suite also supports *BSD operating systems. However, like the Solaris support, not all test profiles are compatible with BSD operating systems, but pts-core has been tested against FreeBSD 7.x/8.x/9.x, NetBSD, PC-BSD 7/8/9, DragonFlyBSD 3.0/3.2/3.4/3.6, and OpenBSD 4.4/4.6. The Phoronix Test Suite will also work with Debian GNU/kFreeBSD.</p>
-<p>For DragonFlyBSD, it's a matter of just using <em>pkg_radd</em> with php5, php5-json, php5-dom, and php5-zip or <em>pkgsrc</em>. Under FreeBSD/PC-BSD, PHP can be obtained from the <em>php5</em> and <em>php5-extensions</em> Ports collection.</p>
+<p>The Phoronix Test Suite also supports *BSD operating systems. However, like the Solaris support, not all test profiles are compatible with BSD operating systems, but pts-core has been tested against FreeBSD 7.x/8.x/9.x, NetBSD, PC-BSD 7/8/9, DragonFlyBSD 3.0/3.2/3.4/3.6/4.2, and OpenBSD 4.4/4.6. The Phoronix Test Suite will also work with Debian GNU/kFreeBSD.</p>
+<p>For DragonFlyBSD, it's a matter of just using <em>pkg_radd</em> with php5, php5-json, php5-dom, and php5-zip or <em>pkgsrc</em>. With DragonFlyBSD using dports, the command is <em>pkg install php5 php5-dom php5-zip php5-json php5-simplexml</em>. Under FreeBSD/PC-BSD, PHP can be obtained from the <em>php5</em> and <em>php5-extensions</em> Ports collection.</p>
 <h2>Mac OS X Installation</h2>
 <p>The Phoronix Test Suite is fully supported on Apple's Mac OS X operating system as of Mac OS X 10.5 with improved support under Mac OS X 10.6. PHP ships with Mac OS X by default so it's simply a matter of downloading the Phoronix Test Suite package, extracting it, and running the executable. For tests that rely upon a compiler, Apple's XCode with GCC and LLVM can be utilized.</p>
 <h2>Windows Installation</h2>
-<p>The Phoronix Test Suite support on Windows is in development and will function just fine, but is not yet feature complete compared to the other operating systems support. At this time the Phoronix Test Suite client is dependent upon PHP being installed to <em>C:\Program Files (x86)\PHP\php</em>. The Phoronix Test Suite also uses <a href="http://www.cpuid.com/cpuz.php">CPU-Z</a> for much of the hardware detection support on Windows and is dependent upon CPU-Z being installed to <em>C:\Program Files\CPUID\CPU-Z\cpuz.exe</em> if you wish to utilize this hardware reporting feature. In terms of the Microsoft Windows support, right now the Phoronix Test Suite is developed and solely tested against Microsoft Windows 7 x64 and Microsoft Windows 8 x64.</p>
+<p>The Phoronix Test Suite support on Microsoft Windows is in development and will function just fine, but is not yet feature complete compared to the other operating systems support. Only a small subset of test profiles, mostly related to graphics, are supported. In terms of the version support, right now the Phoronix Test Suite is developed and tested solely against Microsoft Windows 7 x64 and Microsoft Windows 8 x64.</p>
+<p>At this time the Phoronix Test Suite client is dependent upon the <em>php.exe</em> executable being installed to <em>C:\Program Files (x86)\PHP\ </em> or one of its subdirectories (see PHP installation notes above). Once this requirement is met, simply download the Phoronix Test Suite package, extract it to a directory of your choice, and run <em>phoronix-test-suite.bat</em></p>
+<p>The Phoronix Test Suite also uses <a href="http://www.cpuid.com/cpuz.php">CPU-Z</a> for much of the hardware detection support on Windows and is dependent upon CPU-Z being installed to <em>C:\Program Files\CPUID\CPU-Z\cpuz.exe</em> if you wish to utilize this hardware reporting feature. </p>
+<p>NOTE: because of lack of external dependencies support, it is necessary to manually download and install the files for some test profiles, such as the Unigine graphics benchmarks. See Troubleshooting for more information.</p>
 <h2>Facebook HipHop</h2>
-<p>The Phoronix Test Suite can use Facebook's <a href="https://github.com/facebook/hiphop-php">HopHop HHVM</a> virtual machine as an alternative to the de facto PHP implementation. The Phoronix Test Suite has been tested against HHVM 2.0. If HHVM is present on the system but not PHP, it will automatically be used by the Phoronix Test Suite. Alternatively, the <em>PHP_BIN</em> environment variable can be set to point to an alternative <em>hhvm</em> binary.</p>
+<p>The Phoronix Test Suite can use Facebook's <a href="https://github.com/facebook/hiphop-php">HipHop HHVM</a> virtual machine as an alternative to the de facto PHP implementation. The Phoronix Test Suite has been tested against HHVM 2.0. If HHVM is present on the system but not PHP, it will automatically be used by the Phoronix Test Suite. Alternatively, the <em>PHP_BIN</em> environment variable can be set to point to an alternative <em>hhvm</em> binary.</p>
 <p>The Phoronix Test Suite also supports the older version of Facebook HipHop that serves as a PHP to C++ translator and compiler with GCC. This support though is primitive and not officially supported. To compile the Phoronix Test Suite using HipHop/GCC, run <em>find . -name "*.php" > files.list && hphp --input-list=files.list -k 1 --log=3 --include-path="." --cluster-count=50 -v "AllDynamic=true" -v "AllVolatile=true"</em> from the root <em>phoronix-test-suite/</em> directory. It can then be executed in the form of <em>/tmp/hphp_XXX/program -f pts-core/phoronix-test-suite.php system-info</em>.</p>
 </body>
 </html>

documentation/stubs/02_external_dependencies.html

@@ -1 +1 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>External Dependencies</title></head><body><p>The Phoronix Test Suite has a feature known as "External Dependencies" where the Phoronix Test Suite can attempt to automatically install some of the test-specific dependencies on supported distributions. If running on a distribution where there is currently no External Dependencies profile, the needed package name(s) are listed for manual installation.</p><p>Below are a list of the operating systems that currently have external dependencies support within the Phoronix Test Suite for the automatic installation of needed test files.<hr><ul></ul><li>Amazon</li><li>Angstrom</li><li>Arch Linux</li><li>CentOS</li><li>ClearOS</li><li>ClearOS Core Server</li><li>Debian</li><li>DragonFlyBSD</li><li>Fedora</li><li>Fluxbuntu</li><li>FreeBSD</li><li>GNU KFreeBSD</li><li>Gentoo</li><li>Goobuntu</li><li>HP</li><li>Joli Cloud</li><li>Linaro</li><li>Linux Mint</li><li>MEPIS</li><li>Mac OS X</li><li>MacPorts</li><li>Mageia</li><li>Mandriva</li><li>MeeGo</li><li>Moblin</li><li>Mythbuntu</li><li>NetBSD</li><li>Nexenta Core</li><li>OLPC</li><li>OpenIndiana</li><li>OpenMandriva</li><li>OpenSolaris</li><li>OpenSuSE</li><li>Optware</li><li>Oracle Server</li><li>PCLinuxOS</li><li>PTS Desktop Live</li><li>PTS Linux Live</li><li>Palm</li><li>Pardus Linux</li><li>Red Hat Enterprise</li><li>Red Hat Enterprise Server</li><li>SUSE</li><li>SUSE Linux</li><li>Scientific</li><li>ScientificSL</li><li>Ubuntu</li><li>Zenwalk</li><li>gNewSense</li></p></body></html>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>External Dependencies</title></head><body><p>The Phoronix Test Suite has a feature known as "External Dependencies" where the Phoronix Test Suite can attempt to automatically install some of the test-specific dependencies on supported distributions. If running on a distribution where there is currently no External Dependencies profile, the needed package name(s) are listed for manual installation.</p><p>Below are a list of the operating systems that currently have external dependencies support within the Phoronix Test Suite for the automatic installation of needed test files.<hr><ul></ul><li>Alpine Linux</li><li>Amazon</li><li>Angstrom</li><li>Arch Linux</li><li>CentOS</li><li>ClearOS</li><li>ClearOS Core Server</li><li>Debian</li><li>DragonFlyBSD</li><li>Fedora</li><li>Fluxbuntu</li><li>FreeBSD</li><li>GNU KFreeBSD</li><li>Gentoo</li><li>Goobuntu</li><li>HP</li><li>Joli Cloud</li><li>Linaro</li><li>Linux Mint</li><li>MEPIS</li><li>Mac OS X</li><li>MacPorts</li><li>Mageia</li><li>Mandriva</li><li>MeeGo</li><li>Moblin</li><li>Mythbuntu</li><li>NetBSD</li><li>Nexenta Core</li><li>OLPC</li><li>OpenIndiana</li><li>OpenMandriva</li><li>OpenSolaris</li><li>OpenSuSE</li><li>Optware</li><li>Oracle Server</li><li>PCLinuxOS</li><li>PTS Desktop Live</li><li>PTS Linux Live</li><li>Palm</li><li>Pardus Linux</li><li>Red Hat Enterprise</li><li>Red Hat Enterprise Server</li><li>SUSE</li><li>SUSE Linux</li><li>Scientific</li><li>ScientificSL</li><li>Solus</li><li>Solus Linux</li><li>Ubuntu</li><li>Void Linux</li><li>Zenwalk</li><li>gNewSense</li></p></body></html>

documentation/stubs/40_configuration.html

@@ -57,6 +57,8 @@
 <p>This is similar to the FORCE_TIMES_TO_RUN option but will only be used if the test profile's run count is less than this defined value.</p>
 <p><strong>NO_FILE_HASH_CHECKS</strong></p>
 <p>To disable MD5/SHA256 check-sums from being checked when downloading test files, set this variable to 1. This variable used to be known as <em>NO_MD5_CHECKS</em>, which is still honored but was changed to <em>NO_FILE_HASH_CHECKS</em> to reflect other kind of file hash sum checks.</p>
+<p><strong>NO_HTTPS</strong></p>
+<p>Set this environment variable to 1 if you don't wish to use HTTPS download links for test profiles (or the system/network lacks HTTPS support). When enabled, HTTPS links will then be done over HTTP.</p>
 <p><strong>PTS_DOWNLOAD_CACHE</strong></p>
 <p>While non-standard Phoronix Test Suite download caches can be specified within the <em>user-config.xml</em> file, an additional directory to look for potential Phoronix Test Suite download files can be specified by this variable.</p>
 <p><strong>GRAPH_HIGHLIGHT</strong></p>

documentation/stubs/50_general_information.html

@@ -34,6 +34,13 @@
 <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>Troubleshooting</h2>
+In the event that a test profile fails to install or run, the following general troubleshooting steps may be helpful:
+
+<p>- If a test profile fails immediately after starting, check the test profile's directory in <em>~/.phoronix-test-suite/installed-tests/</em> to confirm that the needed files are present. On platforms without External Dependencies support (Windows), it may be necessary to download the files manually and place them in this directory. If this is the case, you will notice that the "Downloading" phase of test installation completes instantly.</p>
+<p>- Inspect the scripts inside the above test profile's directory and confirm that directories or search paths for the test correspond to those on your system</p>
+<p>- Try running the test profile with the <em>debug-benchmark</em> command, or reinstalling with the <em>debug-install</em> command and make note of any unusual output.
+
 <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>
 <p>- The colors, size, and other attributes for the graphs found within the Phoronix Test Suite Results Viewer can be modified via the file <em>~/.phoronix-test-suite/graph-config.json</em>.</p>

documentation/stubs/99_development_credits.html

@@ -4,54 +4,3 @@
 </head>
 <body>
 <p>The Phoronix Test Suite is based upon the extensive testing and internal tools developed by <a href="http://www.phoronix.com/">Phoronix.com</a> since 2004 along with support from leading tier-one computer hardware and software vendors. The principal architects of the Phoronix Test Suite are <a href="http://www.michaellarabel.com/">Michael Larabel</a> and Matthew Tippett. The phoronix-test-suite, pts_Graph, Phoromatic, Phodevi, tandem_Xml, and nye_Xml are some of the related open-source projects provided by <a href="http://www.phoronix-media.com/">Phoronix Media</a>.</p>
-<p>Below is a list of individuals and organizations that have contributed upstream patches, test profiles, and/or made other contributions to the Phoronix Test Suite that Phoronix Media would like to thank.</p>
-<ul>
-<li>Achim Gottinger</li>
-<li>Achim Lange</li>
-<li>Andrew Schofield</li>
-<li>Apaige</li>
-<li>Ben Kero</li>
-<li>Bryan Quigley</li>
-<li>Chris Campbell</li>
-<li>Daniel D&iacute;az</li>
-<li>Daniel Stodden / Citrix</li>
-<li>Dean Hilkewich</li>
-<li>ESET s.r.o.</li>
-<li>Fatima Sheremetyeva</li>
-<li>Fujitsu</li>
-<li>Hans Ulrich Niedermann</li>
-<li>Intel Open-Source Technology Center</li>
-<li>Jeroen van Rijn</li>
-<li>Johannes Obermayr</li>
-<li>Juan Aguado</li>
-<li>J&ouml;rg Schirottke</li>
-<li>Kenney Phillis</li>
-<li>Kim Bisgaard</li>
-<li>Laminar Research</li>
-<li>Marco Poletti</li>
-<li>Matthew Tippett</li>
-<li>Michael Larabel</li>
-<li>Michael Opdenacker</li>
-<li>Michael Ploujnikov</li>
-<li>Michal Zatloukal</li>
-<li>Mufasa72</li>
-<li>Nicholas Omann</li>
-<li>NickZ</li>
-<li>Nils Kneuper</li>
-<li>NVIDIA Corporation</li>
-<li>Pekka Panula</li>
-<li>Peter Kraus</li>
-<li>Rainer K&ouml;nig</li>
-<li>SOMA Networks, Inc.</li>
-<li>Stefan Doesinger</li>
-<li>Stepan Hrbek</li>
-<li>St&eacute;phane Teletch&eacute;a</li>
-<li>Sun Microsystems</li>
-<li>Tao Zhang</li>
-<li>Thomas Klausner</li>
-<li>Unigine Corp</li>
-<li>Vadim Peretokin</li>
-<li>Zachary Powers</li>
-</ul>
-</body>
-</html>

documentation/stubs/readme-basics.txt

@@ -1,20 +1,20 @@
 The Phoronix Test Suite itself is an open-source framework for conducting automated tests along with reporting of test results, detection of installed system software/hardware, and other features. Modules for the Phoronix Test Suite also allow for integration with git-bisect and other revision control systems for per-commit regression testing, system sensor monitoring, and other extras.
 
-This framework is designed to be an extensible architecture so that new test profiles and suites can be easily added to represent performance benchmarks, unit tests, and other quantitative and qualitative (e.g. image quality comparison) measurements. Available through OpenBenchmarking.org, a collaborative storage platform developed in conjunction with the Phoronix Test Suite, are more than 200 individual test profiles and more than 60 test suites available by default from the Phoronix Test Suite. Independent users are also able to upload their test results, profiles, and suites to OpenBenchmarking.org. A test profile is a single test that can be executed by the Phoronix Test Suite -- with a series of options possible within every test -- and a test suite is a seamless collection of test profiles and/or additional test suites. A test profile consists of a set of bash/shell scripts and XML files while a test suite is a single XML file.
+This framework is designed to be an extensible architecture so that new test profiles and suites can be easily added to represent performance benchmarks, unit tests, and other quantitative and qualitative (e.g. image quality comparison) measurements. Available through OpenBenchmarking.org, a collaborative storage platform developed in conjunction with the Phoronix Test Suite, are more than 200 individual test profiles and more than 60 test suites available by default from the Phoronix Test Suite. Independent users are also able to upload their test results, profiles, and suites to OpenBenchmarking.org. A test profile is a single test that can be executed by the Phoronix Test Suite -- with a series of options possible within every test -- and a test suite is a seamless collection of test profiles and/or additional test suites. A test profile consists of a set of Bash/shell scripts and XML files while a test suite is a single XML file.
 
 [OpenBenchmarking.org](http://www.openbenchmarking.org/) also allows for conducting side-by-side result comparisons, a central location for storing and sharing test results, and collaborating over test data. [Phoromatic](http://www.phoromatic.com/) is a complementary platform to OpenBenchmarking.org and the Phoronix Test Suite for interfacing with Phoronix Test Suite client(s) to automatically execute test runs on a timed, per-commit, or other trigger-driven basis. Phoromatic is designed for enterprise and allows for the easy management of multiple networked systems running Phoronix Test Suite clients via a single web-based interface.
 
 Professional support and custom engineering for the Phoronix Test Suite, Phoromatic, and OpenBenchmarking.org is available by contacting <http://www.phoronix-test-suite.com/>.
 
-Full details on the Phoronix Test Suite setup and usage is available from the included HTML/PDF documentation within the phoronix-test-suite package and from the Phoronix Test Suite web-site.
+Full details on the Phoronix Test Suite setup and usage is available from the included HTML/PDF documentation within the phoronix-test-suite package and from the Phoronix Test Suite website.
 
-## INSTALLATION & SETUP:
+## Installation & Setup
 
 The Phoronix Test Suite is supported on Linux, *BSD, Solaris, Mac OS X, and Windows systems. However, the most full-featured and well supported operating system for conducting the tests is Linux with some non-basic functionality not being available under all platforms. The Phoronix Test Suite software/framework is compatible with all major CPU architectures (e.g. i686, x86_64, ARM, PowerPC), but not all of the test profiles/suites are compatible with all architectures.
 
-The Phoronix Test Suite can be installed for system-wide usage or run locally without installation from the extracted tar.gz/zip package. The only hard dependency on the Phoronix Test Suite is having command-line support for PHP (PHP 5.2+) installed. A complete PHP stack (e.g. with web-server) is NOT needed, but merely the PHP command-line support, which is widely available from operating system package managers under the name `php`, `php5-cli`, or `php5`.
+The Phoronix Test Suite can be installed for system-wide usage or run locally without installation from the extracted tar.gz/zip package. The only hard dependency on the Phoronix Test Suite is having command-line support for PHP (PHP 5.3+) installed. A complete PHP stack (e.g. with web server) is **not** needed, but merely the PHP command-line support, which is widely available from operating system package managers under the name `php`, `php5-cli`, or `php5`.
 
-## USAGE:
+## Usage
 
 The process to download, install/setup, execute, and report the results of a benchmark can be as simple as a command such as `phoronix-test-suite benchmark smallpt` to run a simple CPU test profile. If wishing to simply install a test, it's a matter of running `phoronix-test-suite install <test or suite name>` and to run it's `phoronix-test-suite run <test or suite name>`. There's also a batch mode for non-interactive benchmarking by first running `phoronix-test-suite batch-setup` and then using the `batch-run` sub-command rather than `run`.
 
@@ -22,4 +22,4 @@ Viewing installed system hardware and software is available via `phoronix-test-s
 
 Facilitating a result comparison from OpenBenchmarking.org can be done by running, for example, `phoronix-test-suite benchmark 1204293-BY-PHORONIX357` if wishing to compare the results of the `http://openbenchmarking.org/result/1204293-BY-PHORONIX357` result file.
 
-Additional information is available from the Phoronix Test Suite web-site <http://www.phoronix-test-suite.com/> and the material bundled within the `phoronix-test-suite/documentation/` directory. A man page is also bundled with the phoronix-test-suite software.
+Additional information is available from the Phoronix Test Suite website <http://www.phoronix-test-suite.com/> and the material bundled within the `phoronix-test-suite/documentation/` directory. A man page is also bundled with the phoronix-test-suite software.

install-sh

@@ -2,7 +2,7 @@
 
 # Phoronix Test Suite
 # URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-# Copyright (C) 2008 - 2015, Phoronix Media
+# Copyright (C) 2008 - 2016, Phoronix Media
 #
 # 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
@@ -99,7 +99,7 @@ chmod +x $DESTDIR$INSTALL_PREFIX/bin/phoronix-test-suite
 # sed 's:\$url = PTS_PATH . \"documentation\/index.html\";:\$url = \"'"$INSTALL_PREFIX"'\/share\/doc\/packages\/phoronix-test-suite\/index.html\";:g' pts-core/commands/gui_gtk.php > $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/commands/gui_gtk.php
 
 # XDG MIME OpenBenchmarking support
-if [ "X$DESTDIR" = "X" ]
+if [ "X$DESTDIR" = "X" ] && which xdg-mime >/dev/null && which xdg-icon-resource >/dev/null
 then
 	#No chroot
 	xdg-mime install pts-core/openbenchmarking.org/openbenchmarking-mime.xml

phoronix-test-suite

@@ -3,8 +3,8 @@
 #
 #	Phoronix Test Suite
 #	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-#	Copyright (C) 2008 - 2015, Phoronix Media
-#	Copyright (C) 2008 - 2015, Michael Larabel
+#	Copyright (C) 2008 - 2016, Phoronix Media
+#	Copyright (C) 2008 - 2016, Michael Larabel
 #	phoronix-test-suite: The Phoronix Test Suite is an extensible open-source testing / benchmarking platform
 #
 #	This program is free software; you can redistribute it and/or modify
@@ -44,12 +44,18 @@ fi
 if [ ! "X$PHP_BIN" = "X" ] && [ -x $PHP_BIN ]
 then
 	export PHP_BIN=$PHP_BIN
+elif [ -x /usr/bin/php7 ] || [ -x /usr/local/bin/php7 ] || [ -x /usr/pkg/bin/php7 ]
+then
+	export PHP_BIN="php7"
 elif [ -x /usr/bin/php5 ] || [ -x /usr/local/bin/php5 ] || [ -x /usr/pkg/bin/php5 ]
 then
 	export PHP_BIN="php5"
 elif [ -x /usr/bin/php ] || [ -x /usr/local/bin/php ] || [ -x /usr/pkg/bin/php ]
 then
 	export PHP_BIN="php"
+elif [ -x /usr/php7/bin/php ]
+then
+	export PHP_BIN="/usr/php7/bin/php"
 elif [ -x /usr/php5/bin/php ]
 then
 	export PHP_BIN="/usr/php5/bin/php"
@@ -62,15 +68,21 @@ then
 elif [ -x /usr/pkg/libexec/cgi-bin/php ]
 then
 	export PHP_BIN="/usr/pkg/libexec/cgi-bin/php"
-elif which php >/dev/null ;
+elif which php >/dev/null 2>&1 ;
 then
 	export PHP_BIN="php"
-elif which php5 >/dev/null ;
+elif which php7 >/dev/null 2>&1 ;
+then
+	export PHP_BIN="php7"
+elif which php5 >/dev/null 2>&1 ;
 then
 	export PHP_BIN="php5"
 elif [ -x /usr/bin/hhvm ]
 then
 	export PHP_BIN="/usr/bin/hhvm"
+elif which hhvm >/dev/null 2>&1 ;
+then
+	export PHP_BIN="hhvm"
 else
 	export PHP_BIN=""
 fi
@@ -80,37 +92,96 @@ if [ "X$PHP_BIN" = "X" ]
 then
 	cat <<'EOT'
 
-PHP 5.2 or newer must be installed for the Phoronix Test Suite
+PHP 5.3 or newer must be installed for the Phoronix Test Suite
 The PHP command-line package is commonly called php-cli, php5-cli, or php.
 For more information visit: http://www.phoronix-test-suite.com/
 
 EOT
 
-if [ -x /usr/bin/apt-get ]
-then
-	echo "The command to likely run for your operating system is: "
-	echo "# apt-get install php5-cli php5-json php5-gd"
-	echo " "
-elif [ -x /usr/bin/yum ]
-then
-	echo "The command to likely run for your operating system is: "
-	echo "# yum install php-cli php-xml"
-	echo " "
-elif [ -x /usr/bin/zypper ]
+if [ -x /usr/bin/zypper ]
 then
+	# SUSE / OpenSUSE
 	echo "The command to likely run for your operating system is: "
 	echo "# zypper install php5 php5-zip"
 	echo " "
+elif [ -x /usr/bin/apt-get ]
+then
+	# Debian / Ubuntu Based Systems
+	echo "The command to likely run for your operating system is: "
+	echo "# apt-get install php-cli php-xml"
+	echo " "
+elif [ -x /usr/bin/dnf ]
+then
+	# Modern Fedora
+	echo "The command to likely run for your operating system is: "
+	echo "# dnf install php-cli php-xml"
+	echo " "
+elif [ -x /usr/bin/yum ]
+then
+	# Red Hat / Fedora / etc
+	echo "The command to likely run for your operating system is: "
+	echo "# yum install php-cli php-xml"
+	echo " "
 elif [ -x /usr/bin/pkg_radd ]
 then
+	# BSD
 	echo "The command to likely run for your operating system is: "
 	echo "# pkg_radd php5 php5-json php5-zip php5-dom"
 	echo " "
 elif [ -x /usr/bin/pacman ]
 then
+	# Arch Linux
 	echo "The command to likely run for your operating system is: "
 	echo "# pacman -S php"
 	echo " "
+elif [ -x /usr/local/sbin/pkg ] || [ -x /usr/sbin/pkg ]
+then
+	# DragonFlyBSD and others
+	echo "The command to likely run for your operating system is: "
+	echo "# pkg install php70 php70-dom php70-zip php70-json php70-simplexml"
+	echo " "
+elif [ -x /usr/local/swupd ]
+then
+	# Clear Linux
+	echo "The command to likely run for your operating system is: "
+	echo "# swupd bundle-add os-testsuite-phoronix"
+	echo " "
+elif [ -x /usr/sbin/pkg_add ]
+then
+	# OpenBSD
+	echo "The command to likely run for your operating system is: "
+	echo "# pkg_add php php-zip"
+	echo " "
+elif [ -x /usr/sbin/equo ]
+then
+	# Sabayon
+	echo "The command to likely run for your operating system is: "
+	echo "# equo install dev-lang/php"
+	echo " "
+elif [ -x /usr/bin/xbps-install ] || [ -x /usr/sbin/xbps-install ]
+then
+	# Void Linux
+	echo "The command to likely run for your operating system is: "
+	echo "# xbps-install -Sy php unzip"
+	echo " "
+elif [ -x /usr/sbin/netpkg ]
+then
+	# Zenwalk / Slackware
+	echo "The command to likely run for your operating system is: "
+	echo "# netpkg php"
+	echo " "
+elif [ -x /sbin/apk ]
+then
+	# Alpine Linux
+	echo "The command to likely run for your operating system is: "
+	echo "# apk add php php-dom php-zip php-json"
+	echo " "
+elif [ -x /usr/bin/urpmi ]
+then
+	# OpenMandriva Linux
+	echo "The command to likely run for your operating system is: "
+	echo "# urpmi php-cli"
+	echo " "
 fi
 
 exit

phoronix-test-suite.bat

@@ -1,7 +1,7 @@
 ::	Phoronix Test Suite
 ::	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-::	Copyright (C) 2008 - 2015, Phoronix Media
-::	Copyright (C) 2008 - 2015, Michael Larabel
+::	Copyright (C) 2008 - 2016, Phoronix Media
+::	Copyright (C) 2008 - 2016, Michael Larabel
 ::	phoronix-test-suite: The Phoronix Test Suite is an extensible open-source testing / benchmarking platform
 ::
 ::	This program is free software; you can redistribute it and/or modify
@@ -25,11 +25,19 @@ set PTS_MODE=CLIENT
 
 :: TODO: Other work to bring this up to sync with the *NIX phoronix-test-suite launcher
 If defined PHP_BIN goto SkipBinSearch
+  
 echo "No PHP_BIN defined checking for usual locations."
-If exist "C:\Program Files (x86)\PHP"\php set PHP_BIN="C:\Program Files (x86)\PHP"\php
-If exist C:\php-gtk2\php set PHP_BIN=C:\php-gtk2\php
-set PHP_BIN="C:\Program Files (x86)\PHP"\php
+
+:: Recursively search C:Program Files (x86)\PHP\ and subdirectories for the php executable
+:: (installed location may vary depending on the installation method.)
+
+for /f "delims=" %%i in ('dir "C:\Program Files (x86)\PHP\php.exe" /s /b') do (set PHP_BIN="%%i")
+
+If exist C:\php-gtk2\php.exe (
+  set PHP_BIN=C:\php-gtk2\php.exe
+  )
 
 :SkipBinSearch
 cls
-%PHP_BIN% pts-core/phoronix-test-suite.php %*
+
+%PHP_BIN% pts-core\phoronix-test-suite.php %*

pts-core/commands/analyze_all_runs.php

@@ -1,30 +1,24 @@
 <?php
-
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
 	Copyright (C) 2008 - 2011, Phoronix Media
 	Copyright (C) 2008 - 2011, Michael Larabel
-
 	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
 	the Free Software Foundation; either version 3 of the License, or
 	(at your option) any later version.
-
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 	GNU General Public License for more details.
-
 	You should have received a copy of the GNU General Public License
 	along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
-
 class analyze_all_runs implements pts_option_interface
 {
 	const doc_section = 'Result Analytics';
 	const doc_description = 'This option will generate a candlestick graph showing the distribution of results from all trial runs. The candlestick graph is similar to the Japanese candlestick charts used by the financial industry, except instead of representing stock data it is numerical result data from all trial runs.\n\nThe tip of the upper-wick represents the highest value of the test runs with the tip of the lower-wick representing the lowest value of all test runs. The upper-edge of the candle body represents the first or last run value and the lower-edge represents the first or last run value. Lastly, if the last run value is less than the first run value, the candle body is the same color as the graph background, otherwise the last run value is greater.';
-
 	public static function argument_checks()
 	{
 		return array(
@@ -33,8 +27,7 @@ class analyze_all_runs implements pts_option_interface
 	}
 	public static function run($args)
 	{
-		pts_client::regenerate_graphs($args[0], 'The ' . $args[0] . ' result file graphs have been re-rendered to show all test runs.', array('graph_render_type' => 'CANDLESTICK'));
+		pts_client::regenerate_graphs($args[0], 'The ' . $args[0] . ' result file graphs have been re-rendered to show all test runs.', array('graph_render_type' => 'HORIZONTAL_BOX_PLOT'));
 	}
 }
-
 ?>

pts-core/commands/analyze_batch.php

@@ -1,54 +0,0 @@
-<?php
-
-/*
-	Phoronix Test Suite
-	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2011, Phoronix Media
-	Copyright (C) 2008 - 2011, Michael Larabel
-
-	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
-	the Free Software Foundation; either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-class analyze_batch implements pts_option_interface
-{
-	const doc_section = 'Result Analytics';
-	const doc_description = 'This option will analyze a batch results file and plot out the performance impact from the different options onto a line graph (i.e. to see the impact that changing the video resolution has on the system\'s performance).';
-
-	public static function argument_checks()
-	{
-		return array(
-		new pts_argument_check(0, array('pts_types', 'is_result_file'), null)
-		);
-	}
-	public static function run($args)
-	{
-		$base_file = $args[0];
-
-		do
-		{
-			$rand_file = rand(1000, 9999);
-			$save_to = 'analyze-' . $rand_file . '/';
-		}
-		while(is_dir(PTS_SAVE_RESULTS_PATH . $save_to));
-		$save_to .= 'composite.xml';
-
-		// Analyze Results
-		$SAVED_RESULTS = pts_merge::generate_analytical_batch_xml($base_file);
-		pts_client::save_test_result($save_to, $SAVED_RESULTS);
-		echo 'Results Saved To: ' . PTS_SAVE_RESULTS_PATH . $save_to . PHP_EOL . PHP_EOL;
-		pts_client::display_web_page(PTS_SAVE_RESULTS_PATH . dirname($save_to) . '/index.html');
-	}
-}
-
-?>

pts-core/commands/analyze_image_delta.php

@@ -1,138 +0,0 @@
-<?php
-
-/*
-	Phoronix Test Suite
-	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2011, Phoronix Media
-	Copyright (C) 2009 - 2011, Michael Larabel
-
-	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
-	the Free Software Foundation; either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-class analyze_image_delta implements pts_option_interface
-{
-	const doc_section = 'Result Analytics';
-	const doc_description = 'This option will analyze a test result file if it contains any test results that produced an image quality comparison (IQC) and will render image deltas illustrating the difference between images from two test results.';
-
-	public static function argument_checks()
-	{
-		return array(
-		new pts_argument_check(0, array('pts_types', 'is_result_file'), null)
-		);
-	}
-	public static function run($args)
-	{
-		$result = $args[0];
-
-		$result_file = new pts_result_file($result);
-		$result_file_identifiers = $result_file->get_system_identifiers();
-
-		if(count($result_file_identifiers) < 2)
-		{
-			echo PHP_EOL . 'There are not multiple test runs in this result file.' . PHP_EOL;
-			return false;
-		}
-
-		$base_identifier = pts_user_io::prompt_text_menu('Select the base test run', $result_file_identifiers);
-		$base_select = new pts_result_merge_select($result, $base_identifier);
-
-		$compare_identifier = pts_user_io::prompt_text_menu('Select the test run to compare', $result_file_identifiers);
-		$compare_select = new pts_result_merge_select($result, $compare_identifier);
-
-		do
-		{
-			$extract_to = 'iqc-analyze-' . rand(100, 999);
-		}
-		while(is_dir(PTS_SAVE_RESULTS_PATH . $extract_to));
-
-		$extract_result = pts_merge::merge_test_results($base_select, $compare_select);
-		pts_client::save_test_result($extract_to . '/composite.xml', $extract_result);
-
-		$compare_file = new pts_result_file($extract_to);
-		$result_file_writer = new pts_result_file_writer('Image Delta');
-
-		foreach($compare_file->get_result_objects() as $result_object)
-		{
-			if($result_object->test_profile->get_display_format() != 'IMAGE_COMPARISON')
-			{
-				continue;
-			}
-
-			$base_result = null;
-			$compare_result = null;
-
-			foreach($result_object->test_result_buffer->get_buffer_items() as $buffer_item)
-			{
-				if($buffer_item->get_result_identifier() == $base_identifier && $base_result == null)
-				{
-					$base_result = $buffer_item->get_result_value();
-				}
-				else if($buffer_item->get_result_identifier() == $compare_identifier && $compare_result == null)
-				{
-					$compare_result = $buffer_item->get_result_value();
-				}
-
-				if($compare_result != null && $base_result != null)
-				{
-					break;
-				}
-			}
-
-			if($compare_result == null || $base_result == null)
-			{
-				continue;
-			}
-
-			$base_img = imagecreatefromstring(base64_decode($base_result));
-			$compare_img = imagecreatefromstring(base64_decode($compare_result));
-			$delta_img = imagecreatefromstring(base64_decode($compare_result));
-			$img_width = imagesx($base_img);
-			$img_height = imagesy($base_img);
-			$img_changed = false;
-
-			for($x = 0; $x < $img_width; $x++)
-			{
-				for($y = 0; $y < $img_height; $y++)
-				{
-					$base_image_color = pts_image::rgb_gd_color_at($base_img, $x, $y);
-					$compare_image_color = pts_image::rgb_gd_color_at($compare_img, $x, $y);
-
-					if($base_image_color == $compare_image_color || pts_image::rgb_int_diff($base_image_color, $compare_image_color) < 9)
-					{
-						if(($cords = pts_image::color_pixel_delta($base_img, $compare_img, $x, $y)))
-						{
-							$pixel_rgb = pts_image::rgb_gd_color_at($delta_img, $cords[0], $cords[1]);
-							$color_invert = imagecolorresolve($delta_img, 255 - $pixel_rgb[0], 255 - $pixel_rgb[1], 255 - $pixel_rgb[2]);
-							imagesetpixel($delta_img, $x, $y, $color_invert);
-							$img_changed = true;
-						}
-					}
-				}
-			}
-
-			if($img_changed)
-			{
-				imagepng($delta_img, PTS_SAVE_RESULTS_PATH . $extract_to . '/scratch.png');
-				$result_value = base64_encode(file_get_contents(PTS_SAVE_RESULTS_PATH . $extract_to . '/scratch.png', FILE_BINARY));
-				pts_file_io::unlink(PTS_SAVE_RESULTS_PATH . $extract_to . '/scratch.png');
-				$result_file_writer->add_result_from_result_object_with_value_string($result_object, $result_value);
-			}
-		}
-
-		pts_client::save_result_file($result_file_writer, $extract_to);
-		pts_client::display_web_page(PTS_SAVE_RESULTS_PATH . $extract_to . '/composite.xml');
-	}
-}
-
-?>

pts-core/commands/auto_compare.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2012, Phoronix Media
-	Copyright (C) 2012, Michael Larabel
+	Copyright (C) 2012 - 2016, Phoronix Media
+	Copyright (C) 2012 - 2016, Michael Larabel
 
 	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
@@ -39,7 +39,7 @@ class auto_compare implements pts_option_interface
 
 			if($test_object instanceof pts_test_profile)
 			{
-				array_push($compare_tests, $test_object->get_identifier(false));
+				$compare_tests[] = $test_object->get_identifier(false);
 
 				if(!isset($compare_subsystems[$test_object->get_test_hardware_type()]))
 				{
@@ -113,11 +113,10 @@ class auto_compare implements pts_option_interface
 
 			foreach($json['auto_compare']['public_ids'] as $public_id)
 			{
-				$result_xml = pts_openbenchmarking::clone_openbenchmarking_result($public_id, true);
-
-				if($result_xml)
+				$ret = pts_openbenchmarking::clone_openbenchmarking_result($public_id);
+				if($ret)
 				{
-					$result_file = new pts_result_file($result_xml);
+					$result_file = new pts_result_file($public_id);
 					$result_objects = $result_file->get_result_objects();
 
 					foreach($result_objects as $i => &$result_object)
@@ -140,54 +139,49 @@ class auto_compare implements pts_option_interface
 						continue;
 					}
 					$result_file->override_result_objects($result_objects);
-
-					array_push($compare_results, $result_file);
+					pts_client::save_test_result($result_file->get_file_location(), $result_file->get_xml());
+					$compare_results[] = $public_id;
 				}
 			}
 
 			if(count($compare_results) > 0)
 			{
-				$result_xml = pts_merge::merge_test_results_array($compare_results);
+				$result_file = new pts_result_file(null, true);
+				$result_file->merge($compare_results);
+				$result_objects = $result_file->get_result_objects();
+				$system_count = $result_file->get_system_count();
+				$result_count = count($result_objects);
+				$result_match_count = array();
 
-				if(count($compare_results) > 2)
+				if($result_count > 3)
 				{
-					$result_file = new pts_result_file($result_xml);
-					$result_objects = $result_file->get_result_objects();
-					$system_count = $result_file->get_system_count();
-					$result_count = count($result_objects);
-					$result_match_count = array();
-
-					if($result_count > 3)
+					foreach($result_objects as $i => &$result_object)
 					{
-						foreach($result_objects as $i => &$result_object)
-						{
-							$result_match_count[$i] = $result_object->test_result_buffer->get_count();
-						}
+						$result_match_count[$i] = $result_object->test_result_buffer->get_count();
+					}
 
-						arsort($result_match_count);
-						$biggest_size = pts_arrays::first_element($result_match_count);
-						if($biggest_size == $system_count || $biggest_size > 3)
+					arsort($result_match_count);
+					$biggest_size = pts_arrays::first_element($result_match_count);
+					if($biggest_size == $system_count || $biggest_size > 3)
+					{
+						foreach($result_match_count as $key => $value)
 						{
-							foreach($result_match_count as $key => $value)
+							if($value < 2)
 							{
-								if($value < 2)
-								{
-									unset($result_objects[$key]);
-								}
+								unset($result_objects[$key]);
 							}
 						}
-
-						$result_file->override_result_objects($result_objects);
-						$result_xml = pts_merge::merge_test_results_array(array($result_file));
 					}
+					$result_file->override_result_objects($result_objects);
 				}
 
-				pts_client::save_test_result('auto-comparison/composite.xml', $result_xml);
+				pts_client::save_test_result('auto-comparison/composite.xml', $result_file->get_xml());
 			}
 		}
 
 		pts_test_installer::standard_install(array('auto-comparison'));
-		pts_test_run_manager::standard_run(array('auto-comparison'));
+		$test_run_manager = new pts_test_run_manager();
+		$test_run_manager->standard_run(array('auto-comparison'));
 	}
 	protected static function system_component_to_format(&$system_info, &$to_array, $component_types, $allow_trim_extra = false)
 	{
@@ -203,10 +197,10 @@ class auto_compare implements pts_option_interface
 					{
 						$value_r = explode(' ', str_replace('-', ' ', $value));
 						array_pop($value_r);
-						array_push($to_array, $component_type . ':' . implode(' ', $value_r));
+						$to_array[] = $component_type . ':' . implode(' ', $value_r);
 					}
 
-					array_push($to_array, $component_type . ':' . $value);
+					$to_array[] = $component_type . ':' . $value;
 				}
 			}
 		}

pts-core/commands/auto_sort_result_file.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2014, Phoronix Media
-	Copyright (C) 2014, Michael Larabel
+	Copyright (C) 2014 - 2015, Phoronix Media
+	Copyright (C) 2014 - 2015, Michael Larabel
 
 	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
@@ -33,9 +33,7 @@ class auto_sort_result_file implements pts_option_interface
 	}
 	public static function run($args)
 	{
-		$result = $args[0];
-
-		$result_file = new pts_result_file($result);
+		$result_file = new pts_result_file($args[0]);
 		$result_file_identifiers = $result_file->get_system_identifiers();
 
 		if(count($result_file_identifiers) < 2)
@@ -48,14 +46,8 @@ class auto_sort_result_file implements pts_option_interface
 		echo PHP_EOL . 'Automatically sorting the results...' . PHP_EOL;
 
 		sort($result_file_identifiers);
-
-		foreach($result_file_identifiers as $identifier)
-		{
-			array_push($extract_selects, new pts_result_merge_select($result, $identifier));
-		}
-
-		$ordered_result = pts_merge::merge_test_results_array($extract_selects);
-		pts_client::save_test_result($args[0] . '/composite.xml', $ordered_result);
+		$result_file->reorder_runs($result_file_identifiers);
+		pts_client::save_test_result($result_file->get_file_location(), $result_file->get_xml());
 		pts_client::display_web_page(PTS_SAVE_RESULTS_PATH . $args[0] . '/index.html');
 	}
 	public static function invalid_command($passed_args = null)

pts-core/commands/batch_benchmark.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009, Phoronix Media
-	Copyright (C) 2009, Michael Larabel
+	Copyright (C) 2009 - 2015, Phoronix Media
+	Copyright (C) 2009 - 2015, Michael Larabel
 
 	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
@@ -33,8 +33,9 @@ class batch_benchmark implements pts_option_interface
 	}
 	public static function run($r)
 	{
-		pts_test_installer::standard_install($r, pts_c::batch_mode);
-		pts_test_run_manager::standard_run($r, pts_c::batch_mode);
+		pts_test_installer::standard_install($r, false, true);
+		$test_run_manager = new pts_test_run_manager(true);
+		$test_run_manager->standard_run($r);
 	}
 }
 

pts-core/commands/batch_install.php

@@ -33,7 +33,7 @@ class batch_install implements pts_option_interface
 	}
 	public static function run($r)
 	{
-		pts_test_installer::standard_install($r, pts_c::batch_mode);
+		pts_test_installer::standard_install($r, false, true);
 	}
 }
 

pts-core/commands/batch_run.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2012, Phoronix Media
-	Copyright (C) 2009 - 2012, Michael Larabel
+	Copyright (C) 2009 - 2015, Phoronix Media
+	Copyright (C) 2009 - 2015, Michael Larabel
 
 	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
@@ -33,7 +33,8 @@ class batch_run implements pts_option_interface
 	}
 	public static function run($r)
 	{
-		pts_test_run_manager::standard_run($r, pts_c::batch_mode);
+		$test_run_manager = new pts_test_run_manager(true);
+		$test_run_manager->standard_run($r);
 	}
 	public static function invalid_command($passed_args = null)
 	{

pts-core/commands/benchmark.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2011, Phoronix Media
-	Copyright (C) 2008 - 2011, Michael Larabel
+	Copyright (C) 2008 - 2015, Phoronix Media
+	Copyright (C) 2008 - 2015, Michael Larabel
 
 	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
@@ -42,7 +42,8 @@ class benchmark implements pts_option_interface
 	public static function run($r)
 	{
 		pts_test_installer::standard_install($r);
-		pts_test_run_manager::standard_run($r);
+		$run_manager = new pts_test_run_manager();
+		$run_manager->standard_run($r);
 	}
 }
 

pts-core/commands/build_suite.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2015, Phoronix Media
-	Copyright (C) 2008 - 2015, Michael Larabel
+	Copyright (C) 2008 - 2016, Phoronix Media
+	Copyright (C) 2008 - 2016, Michael Larabel
 
 	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
@@ -37,8 +37,12 @@ class build_suite implements pts_option_interface
 		$possible_suites = pts_openbenchmarking::available_suites();
 		$possible_tests = pts_openbenchmarking::available_tests();
 
-		$suite_writer = new pts_test_suite_writer();
-		$suite_writer->add_suite_information($suite_name, '1.0.0', $suite_maintainer, $suite_test_type, $suite_description);
+		$new_suite = new pts_test_suite();
+		$new_suite->set_title($suite_name);
+		$new_suite->set_version('1.0.0');
+		$new_suite->set_maintainer($suite_maintainer);
+		$new_suite->set_suite_type($suite_test_type);
+		$new_suite->set_description($suite_description);
 
 		foreach($r as $test_object)
 		{
@@ -51,12 +55,12 @@ class build_suite implements pts_option_interface
 				for($i = 0; $i < count($args); $i++)
 				{
 					// Not binding the test profile version to this suite, otherwise change false to true
-					$suite_writer->add_to_suite($test_object->get_identifier(false), $args[$i], $description[$i]);
+					$new_suite->add_to_suite($test_object, $args[$i], $description[$i]);
 				}
 			}
 			else if($test_object instanceof pts_test_suite)
 			{
-				$suite_writer->add_to_suite($test_object->get_identifier(), null, null);
+				$new_suite->add_suite_tests_to_suite($test_object);
 			}
 		}
 
@@ -74,12 +78,13 @@ class build_suite implements pts_option_interface
 
 					for($i = 0; $i < count($args); $i++)
 					{
-						$suite_writer->add_to_suite($test_to_add, $args[$i], $description[$i]);
+						$new_suite->add_to_suite($test_profile, $args[$i], $description[$i]);
 					}
 					break;
 				case 'Add Sub-Suite':
 					$suite_to_add = pts_user_io::prompt_text_menu('Enter test suite', $possible_suites);
-					$suite_writer->add_to_suite($suite_to_add, null, null);
+					$test_suite = new pts_test_suite($suite_to_add);
+					$new_suite->add_suite_tests_to_suite($test_suite);
 					break;
 			}
 			echo PHP_EOL . 'Available Options:' . PHP_EOL;
@@ -87,13 +92,9 @@ class build_suite implements pts_option_interface
 		}
 		while($input_option != 'Save & Exit');
 
-		$suite_identifier = $suite_writer->clean_save_name_string($suite_name);
-		$save_to = PTS_TEST_SUITE_PATH . 'local/' . $suite_identifier . '/suite-definition.xml';
-		mkdir(dirname($save_to));
-
-		if($suite_writer->save_xml($save_to) != false)
+		if($new_suite->save_xml($suite_name) != false)
 		{
-			echo PHP_EOL . PHP_EOL . 'Saved To: ' . $save_to . PHP_EOL . 'To run this suite, type: phoronix-test-suite benchmark ' . $suite_identifier . PHP_EOL . PHP_EOL;
+			echo PHP_EOL . PHP_EOL . 'Saved -- to run this suite, type: phoronix-test-suite benchmark ' . $new_suite->get_identifier() . PHP_EOL . PHP_EOL;
 		}
 	}
 }

pts-core/commands/clone_openbenchmarking_result.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2010, Phoronix Media
-	Copyright (C) 2008 - 2010, Michael Larabel
+	Copyright (C) 2008 - 2015, Phoronix Media
+	Copyright (C) 2008 - 2015, Michael Larabel
 
 	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
@@ -24,7 +24,7 @@ class clone_openbenchmarking_result implements pts_option_interface
 {
 	const doc_section = 'OpenBenchmarking.org';
 	const doc_use_alias = 'clone-result';
-	const doc_description = 'This option will download a local copy of a file that was saved to OpenBenchmarking.org, as long as a valid public ID is supplied. More than one ID can be specified and the results will then be merged.';
+	const doc_description = 'This option will download a local copy of a file that was saved to OpenBenchmarking.org, as long as a valid public ID is supplied.';
 
 	public static function command_aliases()
 	{
@@ -42,14 +42,13 @@ class clone_openbenchmarking_result implements pts_option_interface
 		foreach($args as $id)
 		{
 			$xml = pts_openbenchmarking::clone_openbenchmarking_result($id, true);
-			array_push($result_files, new pts_result_file($xml));
+			if($xml)
+			{
+				$result_file = new pts_result_file($xml);
+				pts_client::save_test_result($id . '/composite.xml', $result_file->get_xml(), true);
+				echo PHP_EOL . 'Result Saved To: ' . PTS_SAVE_RESULTS_PATH . $id . '/composite.xml' . PHP_EOL;
+			}
 		}
-
-		$writer = new pts_result_file_writer(null);
-		pts_merge::merge_test_results_process($writer, $result_files);
-		pts_client::save_test_result($args[0] . '/composite.xml', $writer->get_xml(), true);
-
-		echo PHP_EOL . 'Result Saved To: ' . PTS_SAVE_RESULTS_PATH . $args[0] . '/composite.xml' . PHP_EOL;
 	}
 }
 

pts-core/commands/copy_run_in_result_file.php

@@ -1,64 +0,0 @@
-<?php
-
-/*
-	Phoronix Test Suite
-	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2010 - 2013, Phoronix Media
-	Copyright (C) 2010 - 2013, Michael Larabel
-
-	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
-	the Free Software Foundation; either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-class copy_run_in_result_file implements pts_option_interface
-{
-	const doc_section = 'Result Management';
-	const doc_description = 'This option is used if you wish to change an existing test run within a saved results file.';
-
-	public static function argument_checks()
-	{
-		return array(
-		new pts_argument_check(0, array('pts_types', 'is_result_file'), null)
-		);
-	}
-	public static function run($r)
-	{
-		$result = $r[0];
-
-		$result_file = new pts_result_file($result);
-		$result_file_identifiers = $result_file->get_system_identifiers();
-
-		$copy_identifier = pts_user_io::prompt_text_menu('Select the test run to copy', $result_file_identifiers);
-		$copy_identifier_new = pts_user_io::prompt_user_input('Enter the new identifier of the copied run');
-		$merge_selects = array();
-
-		foreach($result_file_identifiers as $identifier)
-		{
-			$this_merge_select = new pts_result_merge_select($result, $identifier);
-			array_push($merge_selects, $this_merge_select);
-
-			if($identifier == $copy_identifier)
-			{
-				$this_merge_select = new pts_result_merge_select($result, $identifier);
-				$this_merge_select->rename_identifier($copy_identifier_new);
-				array_push($merge_selects, $this_merge_select);
-			}
-		}
-
-		$extract_result = pts_merge::merge_test_results_array($merge_selects);
-		pts_client::save_test_result($r[0] . '/composite.xml', $extract_result);
-		pts_client::display_web_page(PTS_SAVE_RESULTS_PATH . $r[0] . '/index.html');
-	}
-}
-
-?>

pts-core/commands/debug_benchmark.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2014, Phoronix Media
-	Copyright (C) 2009 - 2014, Michael Larabel
+	Copyright (C) 2009 - 2015, Phoronix Media
+	Copyright (C) 2009 - 2015, Michael Larabel
 
 	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
@@ -42,7 +42,9 @@ class debug_benchmark implements pts_option_interface
 		// For debugging, usually running just once is sufficient, unless FORCE_TIMES_TO_RUN is preset
 		pts_client::pts_set_environment_variable('FORCE_TIMES_TO_RUN', 1);
 		// Run the test(s) in debug mode
-		pts_test_run_manager::standard_run($r, pts_c::debug_mode);
+		pts_client::set_debug_mode(true);
+		$test_run_manager = new pts_test_run_manager();
+		$test_run_manager->standard_run($r);
 	}
 }
 

pts-core/commands/debug_dependency_handler.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+	Phoronix Test Suite
+	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
+	Copyright (C) 2015, Phoronix Media
+	Copyright (C) 2015, Michael Larabel
+
+	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
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class debug_dependency_handler implements pts_option_interface
+{
+	const doc_section = 'Other';
+	const doc_description = 'This option is used for testing the distribution-specific dependency handler for external dependencies.';
+
+	public static function run($r)
+	{
+		$exdep_parser = new pts_exdep_generic_parser();
+		foreach($exdep_parser->get_available_packages() as $pkg)
+		{
+			$pkg_data = $exdep_parser->get_package_data($pkg);
+			$files = explode(' ', str_replace(array(' OR ', ', '), ' ', $pkg_data['file_check']));
+			foreach($files as $file)
+			{
+				echo (is_array($file) ? implode(' ', $file) : $file) . ': ';
+				$deps = pts_external_dependencies::packages_that_provide($file);
+				echo (is_array($deps) ? implode(' ', $deps) : null) . PHP_EOL;
+			}
+		}
+	}
+}
+
+?>

pts-core/commands/debug_install.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2010, Phoronix Media
-	Copyright (C) 2009 - 2010, Michael Larabel
+	Copyright (C) 2009 - 2015, Phoronix Media
+	Copyright (C) 2009 - 2015, Michael Larabel
 
 	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
@@ -33,7 +33,8 @@ class debug_install implements pts_option_interface
 	}
 	public static function run($r)
 	{
-		pts_test_installer::standard_install($r, pts_c::debug_mode | pts_c::force_install);
+		pts_client::set_debug_mode(true);
+		pts_test_installer::standard_install($r, true);
 	}
 }
 

pts-core/commands/debug_render_test.php

@@ -0,0 +1,112 @@
+<?php
+
+/*
+	Phoronix Test Suite
+	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
+	Copyright (C) 2015 - 2016, Phoronix Media
+	Copyright (C) 2015 - 2016, Michael Larabel
+
+	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
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class debug_render_test implements pts_option_interface
+{
+	const doc_section = 'Other';
+	const doc_description = 'This option is used during the development of the Phoronix Test Suite software for testing of the result and graph rendering code-paths This option will download a large number of reference test results from LinuxBenchmarking.com.';
+
+	public static function run($r)
+	{
+		$render_dir = pts_client::temporary_directory() . '/pts-render-test-310815/';
+		if(!is_file($render_dir . 'mega-render-test.tar.bz2'))
+		{
+			pts_file_io::mkdir($render_dir);
+			pts_network::download_file('http://linuxbenchmarking.com/misc/mega-render-test-310815.tar.bz2', $render_dir . 'mega-render-test.tar.bz2');
+			pts_compression::archive_extract($render_dir . 'mega-render-test.tar.bz2');
+		}
+
+		if(!defined('PATH_TO_EXPORTED_PHOROMATIC_DATA'))
+		{
+			define('PATH_TO_EXPORTED_PHOROMATIC_DATA', $render_dir . 'mega-render-test-310815/');
+		}
+
+		error_reporting(E_ALL);
+		ini_set('memory_limit','2048M');
+
+		$export_index_json = file_get_contents(PATH_TO_EXPORTED_PHOROMATIC_DATA . 'export-index.json');
+		$export_index_json = json_decode($export_index_json, true);
+		$dump_size = 0;
+		$start = microtime(true);
+		foreach(array_keys($export_index_json['phoromatic']) as $REQUESTED)
+		{
+			$this_render_test = time();
+			$tracker = &$export_index_json['phoromatic'][$REQUESTED];
+			$triggers = $tracker['triggers'];
+			echo PHP_EOL . 'STARTING RENDER TEST ON: ' . $REQUESTED . ' (' . count($triggers) . ' Triggers)' . PHP_EOL;
+			$length = count($tracker['triggers']);
+			$result_files = array();
+
+			foreach($triggers as $trigger)
+			{
+				$results_for_trigger = glob(PATH_TO_EXPORTED_PHOROMATIC_DATA . '/' . $REQUESTED . '/' . $trigger . '/*/composite.xml');
+				echo '.';
+				if($results_for_trigger == false)
+					continue;
+
+				foreach($results_for_trigger as $composite_xml)
+				{
+					// Add to result file
+					$system_name = basename(dirname($composite_xml)) . ': ' . $trigger;
+					$result_files[] = new pts_result_merge_select($composite_xml, null, $system_name);
+				}
+			}
+			echo 'STARTING MERGE; ';
+			$result_file = new pts_result_file(null, true);
+			$result_file->merge($result_files);
+			echo 'MAKING NEW RESULT FILE; ';
+			$extra_attributes = array('reverse_result_buffer' => true, 'force_simple_keys' => true, 'force_line_graph_compact' => true, 'force_tracking_line_graph' => true);
+			//$extra_attributes['normalize_result_buffer'] = true;
+
+			$intent = null;
+			//$table = new pts_ResultFileTable($result_file, $intent);
+			//echo '<p style="text-align: center; overflow: auto;" class="result_object">' . pts_render::render_graph_inline_embed($table, $result_file, $extra_attributes) . '</p>';
+			echo 'STARTING RESULT LOOP; ';
+			$html_dump = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>';
+			foreach($result_file->get_result_objects((isset($_POST['show_only_changed_results']) ? 'ONLY_CHANGED_RESULTS' : -1)) as $i => $result_object)
+			{
+				echo $result_object->test_profile->get_title() . ' ';
+				$html_dump .= '<h3>' . $result_object->get_arguments_description() . '</h3>';
+				$html_dump .= pts_render::render_graph_inline_embed($result_object, $result_file, $extra_attributes);
+				unset($result_object);
+			}
+
+			$table = new pts_ResultFileSystemsTable($result_file);
+			$html_dump .= pts_render::render_graph_inline_embed($table, $result_file, $extra_attributes);
+			echo PHP_EOL . PHP_EOL . 'RENDER TEST ON: ' . $REQUESTED . ' TOOK ' . (time() - $this_render_test) . PHP_EOL;
+			$dump_size += strlen($html_dump);
+			file_put_contents(PATH_TO_EXPORTED_PHOROMATIC_DATA . $REQUESTED . '.html', $html_dump . '</body></html>');
+		}
+		echo PHP_EOL . 'RENDER TEST TOOK: ' . (time() - $start) . PHP_EOL . PHP_EOL;
+		echo PHP_EOL . 'PEAK MEMORY USAGE: ' . round(memory_get_peak_usage(true) / 1048576, 3) . ' MB';
+		echo PHP_EOL . 'PEAK MEMORY USAGE (emalloc): ' . round(memory_get_peak_usage() / 1048576, 3) . ' MB';
+		echo PHP_EOL . 'TOTAL FILE SIZE: ' . ceil($dump_size / 1000) . ' KB';
+		echo PHP_EOL;
+	}
+}
+
+?>

pts-core/commands/debug_self_test.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2013, Phoronix Media
-	Copyright (C) 2013, Michael Larabel
+	Copyright (C) 2013 - 2016, Phoronix Media
+	Copyright (C) 2013 - 2016, Michael Larabel
 
 	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
@@ -27,16 +27,19 @@ class debug_self_test implements pts_option_interface
 
 	public static function run($r)
 	{
+		define('PHOROMATIC_PROCESS', true);
 		$commands = array(
 			'detailed_system_info' => null,
 			'list_available_tests' => null,
 			'list_available_suites' => null,
-			'info' => array('xonotic'),
-			'clone_openbenchmarking_result' => array('1107247-LI-MESACOMMI48'),
-		//	'refresh_graphs' => array('1107247-LI-MESACOMMI48'),
+			'info' => array('pts/all'),
+			'clone_openbenchmarking_result' => array('1107247-LI-MESACOMMI48', '1509040-HA-GCCINTELS17', '1508201-HA-GTX95073337', '1508233-HA-INTELSKYL16'),
+			'refresh_graphs' => array('1107247-LI-MESACOMMI48'),
 			'result_file_to_text' => array('1107247-LI-MESACOMMI48'),
+			'merge_results' => array('1107247-LI-MESACOMMI48', '1509040-HA-GCCINTELS17', '1508201-HA-GTX95073337', '1508233-HA-INTELSKYL16'),
 			'diagnostics' => null,
 			'dump_possible_options' => null,
+			'debug_render_test' => null,
 			);
 
 		$individual_times = array();
@@ -54,7 +57,7 @@ class debug_self_test implements pts_option_interface
 				$c_start = microtime(true);
 				pts_client::execute_command($command, $args);
 				$c_finish = microtime(true);
-				array_push($individual_times[$command], ($c_finish - $c_start));
+				$individual_times[$command][] = ($c_finish - $c_start);
 			}
 		}
 		$finish = microtime(true);
@@ -68,9 +71,9 @@ class debug_self_test implements pts_option_interface
 			echo strtoupper($component) . ': ' . (str_repeat(' ', $longest_c - strlen($component))) . pts_math::set_precision(round(array_sum($times) / count($times), 3), 3) . ' seconds' . PHP_EOL;
 		}
 
-		echo PHP_EOL . 'ELAPSED TIME: ' . (str_repeat(' ', $longest_c - strlen('ELAPSED TIME'))) . round($finish - $start, 3) . ' seconds';
+		echo PHP_EOL . 'TOTAL ELAPSED TIME: ' . (str_repeat(' ', $longest_c - strlen('ELAPSED TIME'))) . round($finish - $start, 3) . ' seconds';
 		echo PHP_EOL . 'PEAK MEMORY USAGE: ' . (str_repeat(' ', $longest_c - strlen('PEAK MEMORY USAGE'))) . round(memory_get_peak_usage(true) / 1048576, 3) . ' MB';
-		echo PHP_EOL . 'PEAK MEMORY USAGE (emalloc): ' . (str_repeat(' ', $longest_c - strlen('PEAK MEMORY USAGE (emalloc)'))) . round(memory_get_peak_usage() / 1048576, 3) . ' MB';
+		echo PHP_EOL . 'PEAK MEMORY USAGE EMALLOC: ' . (str_repeat(' ', $longest_c - strlen('PEAK MEMORY USAGE (emalloc)'))) . round(memory_get_peak_usage() / 1048576, 3) . ' MB';
 		echo PHP_EOL;
 	}
 }

pts-core/commands/debug_test_download_links.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2010, Phoronix Media
-	Copyright (C) 2010, Michael Larabel
+	Copyright (C) 2010 - 2015, Phoronix Media
+	Copyright (C) 2010 - 2015, Michael Larabel
 
 	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
@@ -28,7 +28,7 @@ class debug_test_download_links implements pts_option_interface
 	public static function argument_checks()
 	{
 		return array(
-		new pts_argument_check(0, array('pts_types', 'is_test_or_suite'), null)
+		new pts_argument_check(0, array('pts_types', 'identifier_to_object'), null)
 		);
 	}
 	public static function run($r)
@@ -48,7 +48,7 @@ class debug_test_download_links implements pts_option_interface
 
 					if($file_pointer == false)
 					{
-						echo PHP_EOL . 'DOWNLOAD: ' . $test_file_download->get_filename() . ' / ' . $url . PHP_EOL;
+						echo PHP_EOL . 'BAD URL: ' . $test_file_download->get_filename() . ' / ' . $url . PHP_EOL;
 					}
 					else
 					{

pts-core/commands/default_benchmark.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2010, Phoronix Media
-	Copyright (C) 2009 - 2010, Michael Larabel
+	Copyright (C) 2009 - 2015, Phoronix Media
+	Copyright (C) 2009 - 2015, Michael Larabel
 
 	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
@@ -34,7 +34,8 @@ class default_benchmark implements pts_option_interface
 	public static function run($r)
 	{
 		pts_test_installer::standard_install($r);
-		pts_test_run_manager::standard_run($r, pts_c::defaults_mode);
+		$test_run_manager = new pts_test_run_manager(false, 2);
+		$test_run_manager->standard_run($r);
 	}
 }
 

pts-core/commands/default_run.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2010, Phoronix Media
-	Copyright (C) 2009 - 2010, Michael Larabel
+	Copyright (C) 2009 - 2015, Phoronix Media
+	Copyright (C) 2009 - 2015, Michael Larabel
 
 	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
@@ -33,7 +33,8 @@ class default_run implements pts_option_interface
 	}
 	public static function run($r)
 	{
-		pts_test_run_manager::standard_run($r, pts_c::defaults_mode);
+		$test_run_manager = new pts_test_run_manager(false, 2);
+		$test_run_manager->standard_run($r);
 	}
 }
 

pts-core/commands/dump_documentation.php

@@ -24,15 +24,15 @@ class dump_documentation implements pts_option_interface
 {
 	public static function run($r)
 	{
-		$pdf = new pts_pdf_template(pts_title(false), 'Test Client Documentation');
-		$html_doc = new pts_html_template(pts_title(false), 'Test Client Documentation');
+		$pdf = new pts_pdf_template(pts_core::program_title(false), 'Test Client Documentation');
+		$html_doc = new pts_html_template(pts_core::program_title(false), 'Test Client Documentation');
 
 		$pdf->AddPage();
 		$pdf->Image(PTS_CORE_STATIC_PATH . 'images/pts-308x160.png', 69, 85, 73, 38, 'PNG', 'http://www.phoronix-test-suite.com/');
 		$pdf->Ln(120);
 		$pdf->WriteStatement('www.phoronix-test-suite.com', 'C', 'http://www.phoronix-test-suite.com/');
 		$pdf->Ln(15);
-		$pdf->WriteBigHeaderCenter(pts_title(true));
+		$pdf->WriteBigHeaderCenter(pts_core::program_title(true));
 		$pdf->WriteHeaderCenter('User Manual');
 		//$pdf->WriteText($result_file->get_description());
 
@@ -260,8 +260,8 @@ class dump_documentation implements pts_option_interface
 		file_put_contents(PTS_PATH . 'README.md', $readme);
 
 		// Phoromatic Documentation
-		$pdf = new pts_pdf_template(pts_title(false), 'Phoromatic Documentation');
-		$html_doc = new pts_html_template(pts_title(false), 'Phoromatic Documentation');
+		$pdf = new pts_pdf_template(pts_core::program_title(false), 'Phoromatic Documentation');
+		$html_doc = new pts_html_template(pts_core::program_title(false), 'Phoromatic Documentation');
 
 		$pdf->AddPage();
 		$pdf->Image(PTS_CORE_STATIC_PATH . 'images/pts-308x160.png', 69, 85, 73, 38, 'PNG', 'http://www.phoronix-test-suite.com/');
@@ -270,7 +270,7 @@ class dump_documentation implements pts_option_interface
 		$pdf->Ln(15);
 		$pdf->Image(PTS_CORE_STATIC_PATH . 'images/phoromatic-390x56.png', 55, 250, 0, 0, 'PNG', 'http://www.phoronix-test-suite.com/');
 		//$pdf->Image(PTS_CORE_STATIC_PATH . 'images/phoromatic-390x56.png', 69, 85, 73, 38, 'PNG', 'http://www.phoromatic.com/');
-		$pdf->WriteBigHeaderCenter(pts_title(true));
+		$pdf->WriteBigHeaderCenter(pts_core::program_title(true));
 		$pdf->WriteHeaderCenter('Phoromatic User Manual');
 		$pdf->html_to_pdf(PTS_PATH . 'documentation/phoromatic.html');
 		$pdf_file = PTS_PATH . 'documentation/phoromatic.pdf';

pts-core/commands/dump_possible_options.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2010, Phoronix Media
-	Copyright (C) 2009 - 2010, Michael Larabel
+	Copyright (C) 2009 - 2016, Phoronix Media
+	Copyright (C) 2009 - 2016, Michael Larabel
 
 	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
@@ -32,7 +32,7 @@ class dump_possible_options implements pts_option_interface
 
 			if(!in_array(pts_strings::first_in_string($name, '-'), array('dump', 'debug', 'task')))
 			{
-				array_push($options, $name);
+				$options[] = $name;
 			}
 		}
 

pts-core/commands/edit_result_file.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2014, Phoronix Media
-	Copyright (C) 2014, Michael Larabel
+	Copyright (C) 2014 - 2015, Phoronix Media
+	Copyright (C) 2014 - 2015, Michael Larabel
 
 	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
@@ -38,30 +38,21 @@ class edit_result_file implements pts_option_interface
 	public static function run($r)
 	{
 		$result_file = new pts_result_file($r[0]);
-
 		$result_title = $result_file->get_title();
 		echo PHP_EOL . 'Current Result Title: ' . $result_title . PHP_EOL;
 		$new_title = pts_user_io::prompt_user_input('Enter New Title');
-
 		if(!empty($new_title))
 		{
-			$result_title = $new_title;
+			$result_file->set_title($new_title);
 		}
-
 		$result_description = $result_file->get_description();
 		echo PHP_EOL . 'Current Result Description: ' . $result_description . PHP_EOL;
 		$new_description = pts_user_io::prompt_user_input('Enter New Description');
-
 		if(!empty($new_description))
 		{
-			$result_description = $new_description;
+			$result_file->set_description($new_description);
 		}
-
-		$result_file_writer = new pts_result_file_writer();
-		$result_file_writer->add_result_file_meta_data($result_file, null, $new_title, $new_description);
-		$result_file_writer->add_system_information_from_result_file($result_file);
-		$result_file_writer->add_results_from_result_file($result_file);
-		pts_client::save_test_result($r[0] . '/composite.xml', $result_file_writer->get_xml());
+		pts_client::save_test_result($result_file->get_file_location(), $result_file->get_xml());
 		pts_client::display_web_page(PTS_SAVE_RESULTS_PATH . $r[0] . '/index.html');
 	}
 }

pts-core/commands/extract_from_result_file.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2013, Phoronix Media
-	Copyright (C) 2009 - 2013, Michael Larabel
+	Copyright (C) 2009 - 2015, Phoronix Media
+	Copyright (C) 2009 - 2015, Michael Larabel
 
 	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
@@ -33,9 +33,7 @@ class extract_from_result_file implements pts_option_interface
 	}
 	public static function run($args)
 	{
-		$result = $args[0];
-
-		$result_file = new pts_result_file($result);
+		$result_file = new pts_result_file($args[0]);
 		$result_file_identifiers = $result_file->get_system_identifiers();
 
 		if(count($result_file_identifiers) < 2)
@@ -45,12 +43,8 @@ class extract_from_result_file implements pts_option_interface
 		}
 
 		$extract_identifiers = pts_strings::comma_explode(pts_user_io::prompt_text_menu('Select the test run(s) to extract', $result_file_identifiers, true));
-		$extract_selects = array();
-
-		foreach($extract_identifiers as $extract_identifier)
-		{
-			array_push($extract_selects, new pts_result_merge_select($result, $extract_identifier));
-		}
+		$remove_identifiers = array_diff($result_file_identifiers, $extract_identifiers);
+		$result_file->remove_run($remove_identifiers);
 
 		do
 		{
@@ -58,10 +52,9 @@ class extract_from_result_file implements pts_option_interface
 			$extract_to = pts_user_io::read_user_input();
 			$extract_to = pts_test_run_manager::clean_save_name($extract_to);
 		}
-		while(empty($extract_to) || pts_result_file::is_test_result_file($extract_to));
+		while(empty($extract_to));
 
-		$extract_result = call_user_func_array(array('pts_merge', 'merge_test_results'), $extract_selects);
-		pts_client::save_test_result($extract_to . '/composite.xml', $extract_result);
+		pts_client::save_test_result($extract_to . '/composite.xml', $result_file->get_xml());
 		pts_client::display_web_page(PTS_SAVE_RESULTS_PATH . $extract_to . '/index.html');
 	}
 }

pts-core/commands/finish_run.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2015, Phoronix Media
-	Copyright (C) 2009 - 2015, Michael Larabel
+	Copyright (C) 2009 - 2016, Phoronix Media
+	Copyright (C) 2009 - 2016, Michael Larabel
 
 	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
@@ -43,9 +43,14 @@ class finish_run implements pts_option_interface
 		$system_identifiers = $result_file->get_system_identifiers();
 		$test_positions = array();
 
-		$pos = 0;
-		foreach($result_file->get_result_objects() as $result_object)
+		foreach($result_file->get_result_objects() as $pos => $result_object)
 		{
+			// Don't load null test profile identifier tests into the run queue
+			if($result_object->test_profile->get_identifier() == null)
+			{
+				continue;
+			}
+
 			$this_result_object_identifiers = $result_object->test_result_buffer->get_identifiers();
 
 			foreach($system_identifiers as $system_identifier)
@@ -57,13 +62,10 @@ class finish_run implements pts_option_interface
 						$test_positions[$system_identifier] = array();
 					}
 
-					array_push($test_positions[$system_identifier], $pos);
+					$test_positions[$system_identifier][] = $pos;
 				}
 			}
-
-			$pos++;
 		}
-
 		$incomplete_identifiers = array_keys($test_positions);
 
 		if(count($incomplete_identifiers) == 0)
@@ -73,15 +75,14 @@ class finish_run implements pts_option_interface
 		}
 
 		$selected = pts_user_io::prompt_text_menu('Select which incomplete test run you would like to finish', $incomplete_identifiers);
+		$test_run_manager = new pts_test_run_manager();
 
 		// Now run it
-		if(pts_test_run_manager::initial_checks($args[0]) == false)
+		if($test_run_manager->initial_checks($args[0]) == false)
 		{
 			return false;
 		}
 
-		$test_run_manager = new pts_test_run_manager(pts_c::is_recovering);
-
 		// Load the tests to run
 		if($test_run_manager->load_result_file_to_run($save_name, $selected, $result_file, $test_positions[$selected]) == false)
 		{

pts-core/commands/force_install.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2014, Phoronix Media
-	Copyright (C) 2009 - 2014, Michael Larabel
+	Copyright (C) 2009 - 2015, Phoronix Media
+	Copyright (C) 2009 - 2015, Michael Larabel
 
 	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
@@ -33,7 +33,7 @@ class force_install implements pts_option_interface
 	}
 	public static function run($r)
 	{
-		pts_test_installer::standard_install($r, pts_c::force_install);
+		pts_test_installer::standard_install($r, true);
 	}
 	public static function invalid_command($passed_args = null)
 	{

pts-core/commands/help.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2010 - 2011, Phoronix Media
-	Copyright (C) 2010 - 2011, Michael Larabel
+	Copyright (C) 2010 - 2015, Phoronix Media
+	Copyright (C) 2010 - 2015, Michael Larabel
 
 	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
@@ -27,7 +27,7 @@ class help implements pts_option_interface
 
 	public static function run($r)
 	{
-		echo PHP_EOL . pts_title(true) . PHP_EOL . PHP_EOL;
+		echo PHP_EOL . pts_core::program_title(true) . PHP_EOL . PHP_EOL;
 		echo pts_documentation::basic_description() . PHP_EOL . PHP_EOL . 'View the included PDF / HTML documentation or visit http://www.phoronix-test-suite.com/ for full details.' . PHP_EOL;
 		$options = pts_documentation::client_commands_array();
 

pts-core/commands/info.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2012, Phoronix Media
-	Copyright (C) 2008 - 2012, Michael Larabel
+	Copyright (C) 2008 - 2016, Phoronix Media
+	Copyright (C) 2008 - 2016, Michael Larabel
 
 	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
@@ -28,123 +28,147 @@ class info implements pts_option_interface
 	public static function argument_checks()
 	{
 		return array(
-		new pts_argument_check(0, array('pts_types', 'identifier_to_object'), 'object')
+		new pts_argument_check(0, array('pts_types', 'identifier_to_object'))
 		);
 	}
 	public static function run($args)
 	{
 		echo PHP_EOL;
 
-		if($args['object'] instanceof pts_test_suite)
+		if($args[0] == 'pts/all')
 		{
-			pts_client::$display->generic_heading($args['object']->get_title());
-			echo 'Run Identifier: ' . $args['object']->get_identifier() . PHP_EOL;
-			echo 'Suite Version: ' . $args['object']->get_version() . PHP_EOL;
-			echo 'Maintainer: ' . $args['object']->get_maintainer() . PHP_EOL;
-			echo 'Suite Type: ' . $args['object']->get_suite_type() . PHP_EOL;
-			echo 'Unique Tests: ' . $args['object']->get_unique_test_count() . PHP_EOL;
-			echo 'Suite Description: ' . $args['object']->get_description() . PHP_EOL;
-			echo PHP_EOL;
-			echo $args['object']->pts_format_contained_tests_string();
-			echo PHP_EOL;
+			$args = pts_openbenchmarking::available_tests(false);
 		}
-		else if($args['object'] instanceof pts_test_profile)
+
+		foreach($args as $arg)
 		{
-			$test_title = $args['object']->get_title();
-			$test_version = $args['object']->get_app_version();
-			if(!empty($test_version))
+			$o = pts_types::identifier_to_object($arg);
+
+			if($o instanceof pts_test_suite)
 			{
-				$test_title .= ' ' . $test_version;
-			}
-
-			pts_client::$display->generic_heading($test_title);
-			echo 'Run Identifier: ' . $args['object']->get_identifier() . PHP_EOL;
-			echo 'Profile Version: ' . $args['object']->get_test_profile_version() . PHP_EOL;
-			echo 'Maintainer: ' . $args['object']->get_maintainer() . PHP_EOL;
-			echo 'Test Type: ' . $args['object']->get_test_hardware_type() . PHP_EOL;
-			echo 'Software Type: ' . $args['object']->get_test_software_type() . PHP_EOL;
-			echo 'License Type: ' . $args['object']->get_license() . PHP_EOL;
-			echo 'Test Status: ' . $args['object']->get_status() . PHP_EOL;
-			echo 'Project Web-Site: ' . $args['object']->get_project_url() . PHP_EOL;
-			if($args['object']->get_estimated_run_time() > 1)
-			{
-				echo 'Estimated Run-Time: ' . $args['object']->get_estimated_run_time() . ' Seconds' . PHP_EOL;
-			}
-
-			$download_size = $args['object']->get_download_size();
-			if(!empty($download_size))
-			{
-				echo 'Download Size: ' . $download_size . ' MB' . PHP_EOL;
-			}
-
-			$environment_size = $args['object']->get_environment_size();
-			if(!empty($environment_size))
-			{
-				echo 'Environment Size: ' . $environment_size . ' MB' . PHP_EOL;
-			}
-
-			echo PHP_EOL . 'Description: ' . $args['object']->get_description() . PHP_EOL;
-
-			if($args['object']->test_installation != false)
-			{
-				$last_run = $args['object']->test_installation->get_last_run_date();
-				$last_run = $last_run == '0000-00-00' ? 'Never' : $last_run;
-
-				$avg_time = $args['object']->test_installation->get_average_run_time();
-				$avg_time = !empty($avg_time) ? pts_strings::format_time($avg_time, 'SECONDS') : 'N/A';
-				$latest_time = $args['object']->test_installation->get_latest_run_time();
-				$latest_time = !empty($latest_time) ? pts_strings::format_time($latest_time, 'SECONDS') : 'N/A';
-
-				echo PHP_EOL . 'Test Installed: Yes' . PHP_EOL;
-				echo 'Last Run: ' . $last_run . PHP_EOL;
-
-				if($last_run != 'Never')
+				pts_client::$display->generic_heading($o->get_title());
+				echo 'Run Identifier: ' . $o->get_identifier() . PHP_EOL;
+				echo 'Suite Version: ' . $o->get_version() . PHP_EOL;
+				echo 'Maintainer: ' . $o->get_maintainer() . PHP_EOL;
+				echo 'Suite Type: ' . $o->get_suite_type() . PHP_EOL;
+				echo 'Unique Tests: ' . $o->get_unique_test_count() . PHP_EOL;
+				echo 'Suite Description: ' . $o->get_description() . PHP_EOL;
+				echo PHP_EOL . 'Contained Tests: ' . PHP_EOL;
+				$test_table = array();
+				foreach($o->get_contained_test_result_objects() as $result_obj)
 				{
-					if($args['object']->test_installation->get_run_count() > 1)
-					{
-						echo 'Average Run-Time: ' . $avg_time . PHP_EOL;
-					}
-
-					echo 'Latest Run-Time: ' . $latest_time . PHP_EOL;
-					echo 'Times Run: ' . $args['object']->test_installation->get_run_count() . PHP_EOL;
+					$test_table[] = array($result_obj->test_profile->get_title(), $result_obj->get_arguments_description());
 				}
+				echo pts_user_io::display_text_table($test_table, '    ', 1);
+				echo PHP_EOL;
 			}
-			else
+			else if($o instanceof pts_test_profile)
 			{
-				echo PHP_EOL . 'Test Installed: No' . PHP_EOL;
-			}
+				$test_title = $o->get_title();
+				$test_version = $o->get_app_version();
+				if(!empty($test_version))
+				{
+					$test_title .= ' ' . $test_version;
+				}
 
-			$dependencies = $args['object']->get_dependencies();
-			if(!empty($dependencies) && !empty($dependencies[0]))
-			{
-				echo PHP_EOL . 'Software Dependencies:' . PHP_EOL;
-				echo pts_user_io::display_text_list($args['object']->get_dependency_names());
-			}
-			echo PHP_EOL;
-		}
-		else if($args['object'] instanceof pts_result_file)
-		{
-			echo 'Title: ' . $args['object']->get_title() . PHP_EOL . 'Identifier: ' . $args['object']->get_identifier() . PHP_EOL;
-			echo PHP_EOL . 'Test Result Identifiers:' . PHP_EOL;
-			echo pts_user_io::display_text_list($args['object']->get_system_identifiers());
+				pts_client::$display->generic_heading($test_title);
+				echo 'Run Identifier: ' . $o->get_identifier() . PHP_EOL;
+				echo 'Profile Version: ' . $o->get_test_profile_version() . PHP_EOL;
+				echo 'Maintainer: ' . $o->get_maintainer() . PHP_EOL;
+				echo 'Test Type: ' . $o->get_test_hardware_type() . PHP_EOL;
+				echo 'Software Type: ' . $o->get_test_software_type() . PHP_EOL;
+				echo 'License Type: ' . $o->get_license() . PHP_EOL;
+				echo 'Test Status: ' . $o->get_status() . PHP_EOL;
+				echo 'Project Web-Site: ' . $o->get_project_url() . PHP_EOL;
+				if($o->get_estimated_run_time() > 1)
+				{
+					echo 'Estimated Run-Time: ' . $o->get_estimated_run_time() . ' Seconds' . PHP_EOL;
+				}
 
-			if(count(($tests = $args['object']->get_unique_test_titles())) > 0)
-			{
-				echo PHP_EOL . 'Contained Tests:' . PHP_EOL;
-				echo pts_user_io::display_text_list($tests);
-			}
-			echo PHP_EOL;
-		}
-		else if($args['object'] instanceof pts_virtual_test_suite)
-		{
-			pts_client::$display->generic_heading($args['object']->get_title());
-			echo 'Virtual Suite Description: ' . $args['object']->get_description() . PHP_EOL . PHP_EOL;
+				$download_size = $o->get_download_size();
+				if(!empty($download_size))
+				{
+					echo 'Download Size: ' . $download_size . ' MB' . PHP_EOL;
+				}
 
-			foreach($args['object']->get_contained_test_profiles() as $test_profile)
-			{
-				echo '- ' . $test_profile . PHP_EOL;
+				$environment_size = $o->get_environment_size();
+				if(!empty($environment_size))
+				{
+					echo 'Environment Size: ' . $environment_size . ' MB' . PHP_EOL;
+				}
+
+				echo PHP_EOL . 'Description: ' . $o->get_description() . PHP_EOL;
+
+				if($o->test_installation != false)
+				{
+					$last_run = $o->test_installation->get_last_run_date();
+					$last_run = $last_run == '0000-00-00' ? 'Never' : $last_run;
+
+					$avg_time = $o->test_installation->get_average_run_time();
+					$avg_time = !empty($avg_time) ? pts_strings::format_time($avg_time, 'SECONDS') : 'N/A';
+					$latest_time = $o->test_installation->get_latest_run_time();
+					$latest_time = !empty($latest_time) ? pts_strings::format_time($latest_time, 'SECONDS') : 'N/A';
+
+					echo PHP_EOL . 'Test Installed: Yes' . PHP_EOL;
+					echo 'Last Run: ' . $last_run . PHP_EOL;
+
+					if($last_run != 'Never')
+					{
+						if($o->test_installation->get_run_count() > 1)
+						{
+							echo 'Average Run-Time: ' . $avg_time . PHP_EOL;
+						}
+
+						echo 'Latest Run-Time: ' . $latest_time . PHP_EOL;
+						echo 'Times Run: ' . $o->test_installation->get_run_count() . PHP_EOL;
+					}
+				}
+				else
+				{
+					echo PHP_EOL . 'Test Installed: No' . PHP_EOL;
+				}
+
+				$dependencies = $o->get_external_dependencies();
+				if(!empty($dependencies) && !empty($dependencies[0]))
+				{
+					echo PHP_EOL . 'Software Dependencies:' . PHP_EOL;
+					echo pts_user_io::display_text_list($o->get_dependency_names());
+				}
+				echo PHP_EOL;
+			}
+			else if($o instanceof pts_result_file)
+			{
+				echo 'Title: ' . $o->get_title() . PHP_EOL . 'Identifier: ' . $o->get_identifier() . PHP_EOL;
+				echo PHP_EOL . 'Test Result Identifiers:' . PHP_EOL;
+				echo pts_user_io::display_text_list($o->get_system_identifiers());
+
+				$test_titles = array();
+				foreach($o->get_result_objects() as $result_object)
+				{
+					if($result_object->test_profile->get_display_format() == 'BAR_GRAPH')
+					{
+						$test_titles[] = $result_object->test_profile->get_title();
+					}
+				}
+
+				if(count($test_titles) > 0)
+				{
+					echo PHP_EOL . 'Contained Tests:' . PHP_EOL;
+					echo pts_user_io::display_text_list(array_unique($test_titles));
+				}
+				echo PHP_EOL;
+			}
+			else if($o instanceof pts_virtual_test_suite)
+			{
+				pts_client::$display->generic_heading($o->get_title());
+				echo 'Virtual Suite Description: ' . $o->get_description() . PHP_EOL . PHP_EOL;
+
+				foreach($o->get_contained_test_profiles() as $test_profile)
+				{
+					echo '- ' . $test_profile . PHP_EOL;
+				}
+				echo PHP_EOL;
 			}
-			echo PHP_EOL;
 		}
 	}
 }

pts-core/commands/install_dependencies.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2010, Phoronix Media
-	Copyright (C) 2008 - 2010, Michael Larabel
+	Copyright (C) 2008 - 2015, Phoronix Media
+	Copyright (C) 2008 - 2015, Michael Larabel
 
 	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
@@ -34,7 +34,6 @@ class install_dependencies implements pts_option_interface
 	public static function run($r)
 	{
 		$test_profiles = pts_types::identifiers_to_test_profile_objects($r, true, true);
-		//pts_client::set_test_flags(pts_c::auto_mode);
 		pts_external_dependencies::install_dependencies($test_profiles);
 	}
 }

pts-core/commands/interactive.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2011 - 2013, Phoronix Media
-	Copyright (C) 2011 - 2013, Michael Larabel
+	Copyright (C) 2011 - 2016, Phoronix Media
+	Copyright (C) 2011 - 2016, Michael Larabel
 
 	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
@@ -27,45 +27,10 @@ class interactive implements pts_option_interface
 
 	public static function run($r)
 	{
-		$is_moscow = pts_flags::os_identifier_hash() == 'b28d6a7148b34595c5b397dfcf5b12ac7932b3dc';
-
-		if($is_moscow)
-		{
-			// Auto mount?
-			$drives = pts_file_io::glob('/dev/sda*');
-			sort($drives);
-
-			if(false && count($drives) > 0 && !is_dir('/media/pts-auto-mount') && is_writable('/media/'))
-			{
-				$last_drive = array_pop($drives);
-				echo PHP_EOL . 'Attempting to auto-mount drive: ' . $last_drive . PHP_EOL;
-				mkdir('/media/pts-auto-mount');
-				exec('mount ' . $last_drive . ' /media/pts-auto-mount');
-				putenv('PTS_TEST_INSTALL_ROOT_PATH=/media/pts-auto-mount/');
-			}
-
-			// Auto save results
-			$test_results_name = phodevi::read_property('motherboard', 'serial-number');
-
-			if($test_results_name == null)
-			{
-				$test_results_name = phodevi::read_name('motherboard');
-			}
-			if($test_results_name == null)
-			{
-				$test_results_name = phodevi::read_property('system', 'vendor-identifier');
-			}
-
-			putenv('TEST_RESULTS_NAME=' . str_replace(' ', null, $test_results_name));
-			putenv('TEST_RESULTS_IDENTIFIER=' . $test_results_name);
-			putenv('TEST_RESULTS_DESCRIPTION=Tests using ' . phodevi::read_property('system', 'operating-system') . ' on ' . date('d F Y') . ' of ' . $test_results_name . '.');
-			self::select_drive_mount();
-		}
-
 		pts_openbenchmarking::refresh_repository_lists();
 		pts_client::$display->generic_heading('Interactive Benchmarking');
 		echo 'System Hardware:' . PHP_EOL . phodevi::system_hardware(true) . (phodevi::read_property('motherboard', 'serial-number') != null ? PHP_EOL . 'System Serial Number: ' . phodevi::read_property('motherboard', 'serial-number') : null) . PHP_EOL . PHP_EOL . PHP_EOL;
-		$reboot_on_exit = pts_flags::is_live_cd() && pts_client::user_home_directory() == '/root/';
+		$reboot_on_exit = false;
 
 		do
 		{
@@ -78,12 +43,6 @@ class interactive implements pts_option_interface
 				'SET_RUN_COUNT' => 'Set Test Run Repetition'
 				);
 
-			if($is_moscow)
-			{
-				unset($options['RUN_SUITE']);
-			//	$options['SELECT_DRIVE_MOUNT'] = 'Select Disk Drive To Use For Testing';
-			}
-
 			if(count(pts_client::saved_test_results()) > 0)
 			{
 				$options['BACKUP_RESULTS_TO_USB'] = 'Backup Results To Media Storage';
@@ -101,17 +60,11 @@ class interactive implements pts_option_interface
 
 					foreach($supported_tests as $i => &$test_profile)
 					{
-						if($test_profile->get_title() == null || pts_test_run_manager::test_profile_system_compatibility_check($test_profile) == false)
+						if($test_profile->get_title() == null)
 						{
 							unset($supported_tests[$i]);
 							continue;
 						}
-						if($is_moscow && pts_test_install_request::test_files_available_locally($test_profile) == false)
-						{
-							// Don't show tests where files need to be downloaded
-							unset($supported_tests[$i]);
-							continue;
-						}
 
 						$longest_title_length = max($longest_title_length, strlen($test_profile->get_title()));
 					}
@@ -130,7 +83,8 @@ class interactive implements pts_option_interface
 					$tests_to_run = pts_user_io::prompt_text_menu('Select Test', $supported_tests, true, true);
 					$tests_to_run = explode(',', $tests_to_run);
 					pts_test_installer::standard_install($tests_to_run);
-					$run_manager = pts_test_run_manager::standard_run($tests_to_run, (pts_c::defaults_mode | pts_c::auto_mode));
+					$run_manager = new pts_test_run_manager(false, 2);
+					$run_manager->standard_run($tests_to_run);
 					if($run_manager != false)
 					{
 						pts_client::display_web_page(PTS_SAVE_RESULTS_PATH . $run_manager->get_file_name() . '/index.html', null, true, true);
@@ -141,14 +95,15 @@ class interactive implements pts_option_interface
 
 					foreach(array_map('strtolower', pts_types::subsystem_targets()) as $subsystem)
 					{
-						array_push($possible_suites, 'pts/' . $subsystem);
+						$possible_suites[] = 'pts/' . $subsystem;
 					}
 
 					$suites_to_run = pts_user_io::prompt_text_menu('Select Suite', $possible_suites, true);
 					foreach(explode(',', $suites_to_run) as $suite_to_run)
 					{
 						pts_test_installer::standard_install($suite_to_run);
-						pts_test_run_manager::standard_run($suite_to_run, (pts_c::defaults_mode | pts_c::auto_mode));
+						$run_manager = new pts_test_run_manager(false, 2);
+						$run_manager->standard_run($suite_to_run);
 					}
 					break;
 				case 'SELECT_DRIVE_MOUNT':
@@ -158,7 +113,8 @@ class interactive implements pts_option_interface
 					pts_client::$display->generic_heading('System Test');
 					$system_tests = array('apache', 'c-ray', 'ramspeed', 'postmark');
 					pts_test_installer::standard_install($system_tests);
-					$run_manager = pts_test_run_manager::standard_run($system_tests, (pts_c::defaults_mode | pts_c::auto_mode));
+					$run_manager = new pts_test_run_manager(false, 2);
+					$run_manager->standard_run($system_tests);
 					if($run_manager != false)
 					{
 						pts_client::display_web_page(PTS_SAVE_RESULTS_PATH . $run_manager->get_file_name() . '/index.html', null, true, true);
@@ -170,11 +126,7 @@ class interactive implements pts_option_interface
 					echo 'Software:' . PHP_EOL . phodevi::system_software(true) . PHP_EOL . PHP_EOL;
 					break;
 				case 'SHOW_SENSORS':
-					pts_client::$display->generic_heading('Detected System Sensors');
-					foreach(phodevi::supported_sensors() as $sensor)
-					{
-						echo phodevi::sensor_name($sensor) . ': ' . phodevi::read_sensor($sensor) . ' ' . phodevi::read_sensor_unit($sensor) . PHP_EOL;
-					}
+					pts_client::execute_command('system_sensors');
 					break;
 				case 'SET_RUN_COUNT':
 					$run_count = pts_user_io::prompt_user_input('Set the minimum number of times each test should repeat', false);
@@ -183,20 +135,6 @@ class interactive implements pts_option_interface
 				case 'BACKUP_RESULTS_TO_USB':
 					pts_client::$display->generic_heading('Backing Up Test Results');
 
-					if($is_moscow)
-					{
-						$drives = pts_file_io::glob('/dev/sd*');
-						sort($drives);
-
-						if(count($drives) > 0 && is_writable('/media/'))
-						{
-							$select_drive = pts_user_io::prompt_text_menu('Select Drive / Partition To Save Results', $drives);
-							echo PHP_EOL . 'Attempting to mount: ' . $select_drive . PHP_EOL;
-							mkdir('/media/00-results-backup');
-							exec('mount ' . $select_drive . ' /media/00-results-backup');
-						}
-					}
-
 					foreach(pts_file_io::glob('/media/*') as $media_dir)
 					{
 						if(!is_writable($media_dir))
@@ -209,12 +147,6 @@ class interactive implements pts_option_interface
 						pts_file_io::copy(PTS_SAVE_RESULTS_PATH, $media_dir . '/');
 						break;
 					}
-
-					if($is_moscow && is_dir('/media/00-results-backup'))
-					{
-						exec('umount /media/00-results-backup');
-						rmdir('/media/00-results-backup');
-					}
 					break;
 			}
 			echo PHP_EOL . PHP_EOL;
@@ -242,7 +174,7 @@ class interactive implements pts_option_interface
 		}
 		else
 		{
-			array_push($drives, 'No HDD');
+			$drives[] = 'No HDD';
 			$to_mount = pts_user_io::prompt_text_menu('Select Drive / Partition To Mount', $drives);
 
 			if($to_mount != 'No HDD')

pts-core/commands/internal_run.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2013, Phoronix Media
-	Copyright (C) 2013, Michael Larabel
+	Copyright (C) 2013 - 2015, Phoronix Media
+	Copyright (C) 2013 - 2015, Michael Larabel
 
 	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
@@ -33,7 +33,7 @@ class internal_run implements pts_option_interface
 	}
 	public static function run($r)
 	{
-		pts_test_run_manager::set_batch_mode(array(
+		$test_run_manager = new pts_test_run_manager(array(
 			'UploadResults' => false,
 			'SaveResults' => true,
 			'PromptForTestDescription' => true,
@@ -43,7 +43,7 @@ class internal_run implements pts_option_interface
 			'OpenBrowser' => true
 			));
 
-		pts_test_run_manager::standard_run($r, pts_c::batch_mode);
+		$test_run_manager->standard_run($r);
 	}
 	public static function invalid_command($passed_args = null)
 	{

pts-core/commands/list_available_suites.php

@@ -31,7 +31,7 @@ class list_available_suites implements pts_option_interface
 	}
 	public static function run($r)
 	{
-		$available_suites = pts_openbenchmarking::available_suites(false);
+		$available_suites = array_merge(pts_openbenchmarking::available_suites(false), pts_tests::local_suites());
 		pts_client::$display->generic_heading('Available Suites');
 
 		if(count($available_suites) > 0)

pts-core/commands/list_available_tests.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2015, Phoronix Media
-	Copyright (C) 2008 - 2015, Michael Larabel
+	Copyright (C) 2008 - 2016, Phoronix Media
+	Copyright (C) 2008 - 2016, Michael Larabel
 
 	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
@@ -39,7 +39,7 @@ class list_available_tests implements pts_option_interface
 			$id = substr($identifier, strlen($repo) + 1);
 			$repo_index = pts_openbenchmarking::read_repository_index($repo);
 
-			if(!in_array(phodevi::operating_system(), $repo_index['tests'][$id]['supported_platforms']) || empty($repo_index['tests'][$id]['title']))
+			if((!empty($repo_index['tests'][$id]['supported_platforms']) && !in_array(phodevi::operating_system(), $repo_index['tests'][$id]['supported_platforms'])) || empty($repo_index['tests'][$id]['title']))
 			{
 				// Don't show unsupported tests
 				continue;
@@ -49,9 +49,9 @@ class list_available_tests implements pts_option_interface
 			$test_count++;
 		}
 
-		foreach(pts_file_io::glob(PTS_TEST_PROFILE_PATH . 'local/*/test-definition.xml') as $path)
+		foreach(pts_tests::local_tests() as $identifier)
 		{
-			$test_profile = new pts_test_profile('local/' . basename(dirname($path)));
+			$test_profile = new pts_test_profile($identifier);
 
 			if($test_profile->get_title() != null && $test_profile->is_supported(false))
 			{

pts-core/commands/list_installed_suites.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2013, Phoronix Media
-	Copyright (C) 2009 - 2013, Michael Larabel
+	Copyright (C) 2009 - 2016, Phoronix Media
+	Copyright (C) 2009 - 2016, Michael Larabel
 
 	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
@@ -34,7 +34,7 @@ class list_installed_suites implements pts_option_interface
 			$suite = new pts_test_suite($suite);
 			if($suite->needs_updated_install() == false)
 			{
-				array_push($installed_suites, $suite);
+				$installed_suites[] = $suite;
 			}
 		}
 

pts-core/commands/list_installed_tests.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2011, Phoronix Media
-	Copyright (C) 2008 - 2011, Michael Larabel
+	Copyright (C) 2008 - 2016, Phoronix Media
+	Copyright (C) 2008 - 2016, Michael Larabel
 
 	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

pts-core/commands/list_not_installed_tests.php

@@ -0,0 +1,82 @@
+<?php
+
+/*
+	Phoronix Test Suite
+	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
+	Copyright (C) 2016, Phoronix Media
+	Copyright (C) 2016, Michael Larabel
+
+	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
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class list_not_installed_tests implements pts_option_interface
+{
+	const doc_section = 'Information';
+	const doc_description = 'This option will list all test profiles that are supported and available but presently NOT installed on the system.';
+
+	public static function command_aliases()
+	{
+		return array('list_uninstalled_tests');
+	}
+	public static function run($r)
+	{
+		pts_client::$display->generic_heading('Available Tests Not Installed');
+		$test_count = 0;
+		foreach(pts_openbenchmarking::available_tests(false) as $identifier)
+		{
+			$repo = substr($identifier, 0, strpos($identifier, '/'));
+			$id = substr($identifier, strlen($repo) + 1);
+			$repo_index = pts_openbenchmarking::read_repository_index($repo);
+
+			if((!empty($repo_index['tests'][$id]['supported_platforms']) && !in_array(phodevi::operating_system(), $repo_index['tests'][$id]['supported_platforms'])) || empty($repo_index['tests'][$id]['title']))
+			{
+				// Don't show unsupported tests
+				continue;
+			}
+
+			$test_profile = new pts_test_profile($identifier);
+			if($test_profile->is_test_installed())
+			{
+				// Only show uninstalled tests
+				continue;
+			}
+
+			echo sprintf('%-30ls - %-35ls %-9ls', $identifier, $repo_index['tests'][$id]['title'], $repo_index['tests'][$id]['test_type']) . PHP_EOL;
+			$test_count++;
+		}
+
+		foreach(pts_tests::local_tests() as $identifier)
+		{
+			$test_profile = new pts_test_profile($identifier);
+			if($test_profile->is_test_installed())
+			{
+				// Only show uninstalled tests
+				continue;
+			}
+
+			if($test_profile->get_title() != null && $test_profile->is_supported(false))
+			{
+				echo sprintf('%-30ls - %-35ls %-9ls', $test_profile->get_identifier(), $test_profile->get_title(), $test_profile->get_test_hardware_type()) . PHP_EOL;
+				$test_count++;
+			}
+		}
+
+		if($test_count == 0)
+		{
+			echo PHP_EOL . 'No tests found. Please check that you have Internet connectivity to download test profile data from OpenBenchmarking.org. The Phoronix Test Suite has documentation on configuring the network setup, proxy settings, and PHP network options. Please contact Phoronix Media if you continuing to experience problems.' . PHP_EOL . PHP_EOL;
+		}
+	}
+}
+
+?>

pts-core/commands/make_download_cache.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2015, Phoronix Media
-	Copyright (C) 2008 - 2015, Michael Larabel
+	Copyright (C) 2008 - 2016, Phoronix Media
+	Copyright (C) 2008 - 2016, Michael Larabel
 
 	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
@@ -31,7 +31,7 @@ class make_download_cache implements pts_option_interface
 		pts_openbenchmarking::refresh_repository_lists(null, true);
 
 		// Determine cache location
-		$dc_write_directory = pts_strings::add_trailing_slash(pts_client::parse_home_directory(pts_config::read_user_config('PhoronixTestSuite/Options/Installation/CacheDirectory', PTS_DOWNLOAD_CACHE_PATH)));
+		$dc_write_directory = pts_strings::add_trailing_slash(pts_strings::parse_for_home_directory(pts_config::read_user_config('PhoronixTestSuite/Options/Installation/CacheDirectory', PTS_DOWNLOAD_CACHE_PATH)));
 		echo PHP_EOL . 'Download Cache Directory: ' . $dc_write_directory . PHP_EOL;
 
 		if($dc_write_directory == null || !is_writable($dc_write_directory))
@@ -95,7 +95,7 @@ class make_download_cache implements pts_option_interface
 					}
 					else if($file->get_md5() == $json_download_cache['phoronix-test-suite']['download-cache'][$file->get_filename()]['md5'] && $file->get_sha256() == $json_download_cache['phoronix-test-suite']['download-cache'][$file->get_filename()]['sha256'])
 					{
-						array_push($json_download_cache['phoronix-test-suite']['download-cache'][$file->get_filename()]['associated_tests'], $test_profile->get_identifier());
+						$json_download_cache['phoronix-test-suite']['download-cache'][$file->get_filename()]['associated_tests'][] = $test_profile->get_identifier();
 					}
 				}
 			}
@@ -124,7 +124,7 @@ class make_download_cache implements pts_option_interface
 			{
 				continue;
 			}
-			array_push($cached_tests, $test);
+			$cached_tests[] = $test;
 		}
 		$json_download_cache['phoronix-test-suite']['cached-tests'] = $cached_tests;
 

pts-core/commands/make_openbenchmarking_cache.php

@@ -62,7 +62,11 @@ class make_openbenchmarking_cache implements pts_option_interface
 				{
 					$file_size = round(filesize(PTS_OPENBENCHMARKING_SCRATCH_PATH . $qualified_identifier . '.zip') / 1024, 2);
 					$info = $file_size . 'KB - ' . sha1_file(PTS_OPENBENCHMARKING_SCRATCH_PATH . $qualified_identifier . '.zip');
-					echo ' ' . str_repeat('.', $terminal_width - strlen($qualified_identifier) - 3 - strlen($info)) . ' ' . $info . PHP_EOL;
+					$r_size = $terminal_width - strlen($qualified_identifier) - 3 - strlen($info);
+					if($r_size > 0)
+					{
+						echo ' ' . str_repeat('.', $terminal_width - strlen($qualified_identifier) - 3 - strlen($info)) . ' ' . $info . PHP_EOL;
+					}
 					$total_cache_count++;
 					$total_cache_size += $file_size;
 				}

pts-core/commands/merge_results.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2010, Phoronix Media
-	Copyright (C) 2008 - 2010, Michael Larabel
+	Copyright (C) 2008 - 2016, Phoronix Media
+	Copyright (C) 2008 - 2016, Michael Larabel
 
 	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
@@ -39,7 +39,7 @@ class merge_results implements pts_option_interface
 		{
 			if(pts_types::is_result_file($result_file))
 			{
-				array_push($result_files_to_merge, $result_file);
+				$result_files_to_merge[] = PTS_SAVE_RESULTS_PATH . $result_file . '/composite.xml';
 			}
 		}
 
@@ -58,12 +58,16 @@ class merge_results implements pts_option_interface
 		$merge_to_file .= 'composite.xml';
 
 		// Merge Results
-		$merged_results = call_user_func(array('pts_merge', 'merge_test_results_array'), $result_files_to_merge);
-		pts_client::save_test_result($merge_to_file, $merged_results);
-
+		$result_file = new pts_result_file(array_shift($result_files_to_merge), true);
+		$result_file->merge($result_files_to_merge);
+		pts_client::save_test_result($merge_to_file, $result_file->get_xml());
 		echo 'Merged Results Saved To: ' . PTS_SAVE_RESULTS_PATH . $merge_to_file . PHP_EOL . PHP_EOL;
 		pts_client::display_web_page(PTS_SAVE_RESULTS_PATH . dirname($merge_to_file) . '/index.html');
 	}
+	public static function invalid_command($passed_args = null)
+	{
+		pts_tests::recently_saved_results();
+	}
 }
 
 ?>

pts-core/commands/ob_test_profile_analyze.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2012, Phoronix Media
-	Copyright (C) 2012, Michael Larabel
+	Copyright (C) 2012 - 2016, Phoronix Media
+	Copyright (C) 2012 - 2016, Michael Larabel
 
 	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
@@ -85,8 +85,9 @@ class ob_test_profile_analyze implements pts_option_interface
 			// So for any compiling tasks they will try to use the most aggressive instructions possible
 			putenv('CFLAGS=-march=native -O3');
 			putenv('CXXFLAGS=-march=native -O3');
-			pts_test_installer::standard_install($qualified_identifier, pts_c::force_install);
-			pts_test_run_manager::standard_run($qualified_identifier, (pts_c::defaults_mode | pts_c::auto_mode));
+			pts_test_installer::standard_install($qualified_identifier, true);
+			$run_manager = new pts_test_run_manager(false, 2);
+			$run_manager->standard_run($qualified_identifier);
 
 			if($apitrace)
 			{
@@ -194,7 +195,7 @@ var_dump($screenshots);
 
 					if(count($line) == 2)
 					{
-						array_push($shared_library_dependencies, trim(basename($line[0])));
+						$shared_library_dependencies[] = trim(basename($line[0]));
 					}
 				}
 
@@ -206,7 +207,7 @@ var_dump($screenshots);
 					// So for any compiling tasks they will try to use the most aggressive instructions possible
 					putenv('CFLAGS=-march=' . $march . ' -O3');
 					putenv('CXXFLAGS=-march=' . $march . ' -O3');
-					pts_test_installer::standard_install($qualified_identifier, pts_c::force_install);
+					pts_test_installer::standard_install($qualified_identifier, true);
 					$instruction_usage[$march] = self::analyze_binary_instruction_usage($test_binary);
 
 					if($instruction_usage[$march] == null)

pts-core/commands/openbenchmarking_launcher.php

@@ -48,7 +48,8 @@ class openbenchmarking_launcher implements pts_option_interface
 				case 'benchmark':
 					$to_benchmark = explode(' ', $payload);
 					pts_test_installer::standard_install($to_benchmark);
-					pts_test_run_manager::standard_run($to_benchmark);
+					$run_manager = new pts_test_run_manager();
+					$run_manager->standard_run($to_benchmark);
 					break;
 
 			}

pts-core/commands/openbenchmarking_login.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2012, Phoronix Media
-	Copyright (C) 2008 - 2012, Michael Larabel
+	Copyright (C) 2008 - 2015, Phoronix Media
+	Copyright (C) 2008 - 2015, Michael Larabel
 
 	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
@@ -46,7 +46,7 @@ class openbenchmarking_login implements pts_option_interface
 		$login_state = pts_openbenchmarking::make_openbenchmarking_request('account_login', $login_payload);
 		$json = json_decode($login_state, true);
 
-		if(isset($json['openbenchmarking']['response']['error']))
+		if(!isset($json['openbenchmarking']) || isset($json['openbenchmarking']['response']['error']))
 		{
 			trigger_error($json['openbenchmarking']['response']['error'], E_USER_ERROR);
 			pts_storage_object::remove_in_file(PTS_CORE_STORAGE, 'openbenchmarking');

pts-core/commands/php_conf.php

@@ -0,0 +1,87 @@
+<?php
+
+/*
+	Phoronix Test Suite
+	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
+	Copyright (C) 2016, Phoronix Media
+	Copyright (C) 2016, Michael Larabel
+
+	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
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class php_conf implements pts_option_interface
+{
+	const doc_section = 'System';
+	const doc_description = 'This option will print information that is useful to developers when debugging problems with the Phoronix Test Suite and/or test profiles and test suites.';
+
+	public static function run($r)
+	{
+		$table = array();
+		$table[] = array('PHP:', PTS_PHP_VERSION);
+		$table[] = array('PHP VERSION ID: ', PHP_VERSION_ID);
+		$table[] = array('PHP BINARY: ', getenv('PHP_BIN'));
+		echo PHP_EOL . pts_user_io::display_text_table($table, null, 0) . PHP_EOL;
+		echo PHP_EOL;
+		echo 'MAIN CAPABILITY CHECK: ' . PHP_EOL;
+		pts_client::program_requirement_checks(false, true);
+
+		// TODO: ultimately centralize this below list so it doesn't go stale
+		// TODO: when making it uniform, change function_exists() calls to say pts_function_check() that will read the cached list
+		$functions_to_check = array(
+			'posix_getpid',
+			'posix_getuid',
+			'posix_getpwuid',
+			'posix_isatty',
+			'posix_kill',
+			'posix_setsid',
+			'preg_replace',
+			'socket_create_listen',
+			'pcntl_fork',
+			'pcntl_signal',
+			'ssh2_connect',
+			'sqlite_escape_string',
+			'gzinflate',
+			'gzdeflate',
+			'gzcompress',
+			'imagecreatefromstring',
+			'imagecreatefrompng',
+			'filter_var',
+			'ctype_digit',
+			'ctype_alnum',
+			'finfo_open',
+			'hash_file',
+			'cli_set_process_title',
+			'curl_init',
+			'stream_context_set_params',
+			'imagepng',
+			'imagecreatefromgif',
+			'zip_open',
+			'imagettftext',
+			'imageantialias',
+			'json_decode',
+			'simplexml_load_string',
+			'timezone_name_from_abbr'
+			);
+		sort($functions_to_check);
+		$table = array();
+		foreach($functions_to_check as $func)
+		{
+			$table[] = array($func, (function_exists($func) ? 'PRESENT' : 'MISSING'));
+		}
+		echo 'OPTIONAL FUNCTION CHECKS: ';
+		echo PHP_EOL . pts_user_io::display_text_table($table, null, 0) . PHP_EOL;
+	}
+}
+
+?>

pts-core/commands/pts_version.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2009, Phoronix Media
-	Copyright (C) 2008 - 2009, Michael Larabel
+	Copyright (C) 2008 - 2015, Phoronix Media
+	Copyright (C) 2008 - 2015, Michael Larabel
 
 	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
@@ -32,7 +32,7 @@ class pts_version implements pts_option_interface
 	}
 	public static function run($r)
 	{
-		echo PHP_EOL . pts_title(true) . PHP_EOL;
+		echo PHP_EOL . pts_core::program_title(true) . PHP_EOL;
 	}
 }
 

pts-core/commands/rebuild_composite_xml.php

@@ -1,50 +0,0 @@
-<?php
-
-/*
-	Phoronix Test Suite
-	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2010, Phoronix Media
-	Copyright (C) 2010, Michael Larabel
-
-	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
-	the Free Software Foundation; either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-class rebuild_composite_xml implements pts_option_interface
-{
-	const doc_section = 'Other';
-	const doc_description = 'This option can be used to rebuild your composite XML file in the event that the main result file was corrupted and the test-X.xml files are still present in the result file directory.';
-
-	public static function argument_checks()
-	{
-		return array(
-		new pts_argument_check(0, array('pts_types', 'is_result_file'), null)
-		);
-	}
-	public static function run($r)
-	{
-		$identifier = $r[0];
-		$test_xml_files = pts_file_io::glob(PTS_SAVE_RESULTS_PATH . $identifier . '/test-*.xml');
-
-		if(count($test_xml_files) == 0)
-		{
-			echo PHP_EOL . 'No test XML data was found.' . PHP_EOL;
-			return false;
-		}
-
-		pts_client::save_test_result($identifier . '/composite.xml', pts_merge::merge_test_results_array($test_xml_files));
-		pts_client::regenerate_graphs($identifier, 'The ' . $identifier . ' result file XML has been rebuilt.');
-	}
-}
-
-?>

pts-core/commands/remove_from_result_file.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2013, Phoronix Media
-	Copyright (C) 2009 - 2013, Michael Larabel
+	Copyright (C) 2009 - 2015, Phoronix Media
+	Copyright (C) 2009 - 2015, Michael Larabel
 
 	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
@@ -33,9 +33,7 @@ class remove_from_result_file implements pts_option_interface
 	}
 	public static function run($r)
 	{
-		$result = $r[0];
-
-		$result_file = new pts_result_file($result);
+		$result_file = new pts_result_file($r[0]);
 		$result_file_identifiers = $result_file->get_system_identifiers();
 
 		if(count($result_file_identifiers) < 2)
@@ -45,32 +43,26 @@ class remove_from_result_file implements pts_option_interface
 		}
 
 		$remove_identifiers = explode(',', pts_user_io::prompt_text_menu('Select the test run(s) to remove', $result_file_identifiers, true));
-		$keep_identifiers = array();
-
-		foreach($result_file_identifiers as $identifier)
-		{
-			if(!in_array($identifier, $remove_identifiers))
-			{
-				array_push($keep_identifiers, $identifier);
-			}
-		}
+		$result_file->remove_run($remove_identifiers);
+		$result_dir = dirname($result_file->get_file_location()) . '/';
 
 		foreach(array('test-logs', 'system-logs', 'installation-logs') as $dir_name)
 		{
 			foreach($remove_identifiers as $remove_identifier)
 			{
-				if(is_dir(PTS_SAVE_RESULTS_PATH . $r[0] . '/' . $dir_name . '/' . $remove_identifier))
+				if(is_dir($result_dir . $dir_name . '/' . $remove_identifier))
 				{
-					pts_file_io::delete(PTS_SAVE_RESULTS_PATH . $r[0] . '/' . $dir_name . '/' . $remove_identifier, null, true);
+					pts_file_io::delete($result_dir . $dir_name . '/' . $remove_identifier, null, true);
 				}
 			}
 		}
 
-		$extract_select = new pts_result_merge_select($result, $keep_identifiers);
-		$extract_result = pts_merge::merge_test_results($extract_select);
-
-		pts_client::save_test_result($r[0] . '/composite.xml', $extract_result);
-		pts_client::display_web_page(PTS_SAVE_RESULTS_PATH . $r[0] . '/index.html');
+		pts_client::save_test_result($result_file->get_file_location(), $result_file->get_xml());
+		pts_client::display_web_page($result_dir . '/index.html');
+	}
+	public static function invalid_command($passed_args = null)
+	{
+		pts_tests::invalid_command_helper($passed_args);
 	}
 }
 

pts-core/commands/rename_identifier_in_result_file.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2014, Phoronix Media
-	Copyright (C) 2009 - 2014, Michael Larabel
+	Copyright (C) 2009 - 2015, Phoronix Media
+	Copyright (C) 2009 - 2015, Michael Larabel
 
 	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
@@ -44,19 +44,6 @@ class rename_identifier_in_result_file implements pts_option_interface
 
 		$rename_identifier = pts_user_io::prompt_text_menu('Select the test run to rename', $result_file_identifiers);
 		$rename_identifier_new = pts_user_io::prompt_user_input('Enter the new identifier');
-		$merge_selects = array();
-
-		foreach($result_file_identifiers as $identifier)
-		{
-			$this_merge_select = new pts_result_merge_select($result, $identifier);
-
-			if($identifier == $rename_identifier && $rename_identifier != $rename_identifier_new)
-			{
-				$this_merge_select->rename_identifier($rename_identifier_new);
-			}
-
-			array_push($merge_selects, $this_merge_select);
-		}
 
 		foreach(array('test-logs', 'system-logs', 'installation-logs') as $dir_name)
 		{
@@ -66,8 +53,8 @@ class rename_identifier_in_result_file implements pts_option_interface
 			}
 		}
 
-		$extract_result = pts_merge::merge_test_results_array($merge_selects);
-		pts_client::save_test_result($r[0] . '/composite.xml', $extract_result);
+		$result_file->rename_run($rename_identifier, $rename_identifier_new);
+		pts_client::save_test_result($result_file->get_file_location(), $result_file->get_xml());
 		pts_client::display_web_page(PTS_SAVE_RESULTS_PATH . $r[0] . '/index.html');
 	}
 }

pts-core/commands/reorder_result_file.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2013, Phoronix Media
-	Copyright (C) 2009 - 2013, Michael Larabel
+	Copyright (C) 2009 - 2016, Phoronix Media
+	Copyright (C) 2009 - 2016, Michael Larabel
 
 	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
@@ -31,11 +31,13 @@ class reorder_result_file implements pts_option_interface
 		new pts_argument_check(0, array('pts_types', 'is_result_file'), null)
 		);
 	}
+	public static function command_aliases()
+	{
+		return array('sort_result_file');
+	}
 	public static function run($args)
 	{
-		$result = $args[0];
-
-		$result_file = new pts_result_file($result);
+		$result_file = new pts_result_file($args[0]);
 		$result_file_identifiers = $result_file->get_system_identifiers();
 
 		if(count($result_file_identifiers) < 2)
@@ -44,13 +46,13 @@ class reorder_result_file implements pts_option_interface
 			return false;
 		}
 
-		$extract_selects = array();
 		echo PHP_EOL . 'Enter The New Order To Display The New Results, From Left To Right.' . PHP_EOL;
 
+		$sorted_identifiers = array();
 		do
 		{
 			$extract_identifier = pts_user_io::prompt_text_menu('Select the test run to be showed next', $result_file_identifiers);
-			array_push($extract_selects, new pts_result_merge_select($result, $extract_identifier));
+			$sorted_identifiers[] = $extract_identifier;
 
 			$old_identifiers = $result_file_identifiers;
 			$result_file_identifiers = array();
@@ -59,14 +61,14 @@ class reorder_result_file implements pts_option_interface
 			{
 				if($identifier != $extract_identifier)
 				{
-					array_push($result_file_identifiers, $identifier);
+					$result_file_identifiers[] = $identifier;
 				}
 			}
 		}
 		while(count($result_file_identifiers) > 0);
 
-		$ordered_result = pts_merge::merge_test_results_array($extract_selects);
-		pts_client::save_test_result($args[0] . '/composite.xml', $ordered_result);
+		$result_file->reorder_runs($sorted_identifiers);
+		pts_client::save_test_result($result_file->get_file_location(), $result_file->get_xml());
 		pts_client::display_web_page(PTS_SAVE_RESULTS_PATH . $args[0] . '/index.html');
 	}
 	public static function invalid_command($passed_args = null)

pts-core/commands/result_file_to_csv.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2011, Phoronix Media
-	Copyright (C) 2009 - 2011, Michael Larabel
+	Copyright (C) 2009 - 2015, Phoronix Media
+	Copyright (C) 2009 - 2015, Michael Larabel
 
 	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
@@ -37,11 +37,15 @@ class result_file_to_csv implements pts_option_interface
 		$result_output = pts_result_file_output::result_file_to_csv($result_file);
 
 		// To save the result:
-		$file = pts_client::user_home_directory() . $r[0] . '.csv';
+		$file = pts_core::user_home_directory() . $r[0] . '.csv';
 		file_put_contents($file, $result_output);
 
 		echo $result_output;
 	}
+	public static function invalid_command($passed_args = null)
+	{
+		pts_tests::invalid_command_helper($passed_args);
+	}
 }
 
 ?>

pts-core/commands/result_file_to_pdf.php

@@ -39,83 +39,8 @@ class result_file_to_pdf implements pts_option_interface
 		pts_client::generate_result_file_graphs($r[0], $tdir);
 
 		$result_file = new pts_result_file($r[0]);
-		$pdf = new pts_pdf_template($result_file->get_title(), null);
-
-		$pdf->AddPage();
-		$pdf->Image(PTS_CORE_STATIC_PATH . 'images/pts-308x160.png', 69, 85, 73, 38);
-		$pdf->Ln(120);
-		$pdf->WriteStatementCenter('www.phoronix-test-suite.com');
-		$pdf->Ln(15);
-		$pdf->WriteBigHeaderCenter($result_file->get_title());
-		$pdf->WriteText($result_file->get_description());
-
-
-		$pdf->AddPage();
-		$pdf->Ln(15);
-
-		$identifiers = $result_file->get_system_identifiers();
-		$hardware_r = $result_file->get_system_hardware();
-		$software_r = $result_file->get_system_software();
-		$notes_r = $result_file->get_system_notes();
-		$tests = $result_file->get_test_titles();
-
-		$pdf->SetSubject($result_file->get_title() . ' Benchmarks');
-		$pdf->SetKeywords(implode(', ', $identifiers));
-
-		$pdf->WriteHeader('Test Systems:');
-		for($i = 0; $i < count($identifiers); $i++)
-		{
-			$pdf->WriteMiniHeader($identifiers[$i]);
-			$pdf->WriteText($hardware_r[$i]);
-			$pdf->WriteText($software_r[$i]);
-			//$pdf->WriteText($notes_r[$i]);
-		}
-
-		/*
-		if(count($identifiers) > 1 && is_file($tdir . 'result-graphs/overview.jpg'))
-		{
-			$pdf->AddPage();
-			$pdf->Ln(100);
-			$pdf->Image($tdir . 'result-graphs/overview.jpg', 15, 40, 180);
-		}
-		*/
-
-
-		$pdf->AddPage();
-		$placement = 1;
-		for($i = 1; $i <= count($tests); $i++)
-		{
-			if(is_file($tdir . 'result-graphs/' . $i . '.png'))
-			{
-				$pdf->Ln(100);
-				$pdf->Image($tdir . 'result-graphs/' . $i . '.png', 50, 40 + (($placement - 1) * 120), 120);
-			}
-
-			if($placement == 2)
-			{
-				$placement = 0;
-
-				if($i != count($tests))
-				{
-					$pdf->AddPage();
-				}
-			}
-			$placement++;
-		}
-
-
-		// To save:
-		/*
-		$pdf_file = 'SAVE_TO';
-
-		if(substr($pdf_file, -4) != '.pdf')
-		{
-			$pdf_file .= '.pdf';
-		}
-		*/
-		$pdf_file = pts_client::user_home_directory() . $r[0] . '.pdf';
-		$pdf->Output($pdf_file);
-		pts_file_io::delete($tdir, null, true);
+		$pdf_file = pts_core::user_home_directory() . $r[0] . '.pdf';
+		$pdf_output = pts_result_file_output::result_file_to_pdf($result_file, $pdf_file, 'F');
 		echo PHP_EOL . 'Saved To: ' . $pdf_file . PHP_EOL;
 	}
 	public static function invalid_command($passed_args = null)

pts-core/commands/result_file_to_suite.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2011, Phoronix Media
-	Copyright (C) 2008 - 2011, Michael Larabel
+	Copyright (C) 2008 - 2016, Phoronix Media
+	Copyright (C) 2008 - 2016, Michael Larabel
 
 	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
@@ -44,27 +44,31 @@ class result_file_to_suite implements pts_option_interface
 		$suite_maintainer = pts_user_io::prompt_user_input('Enter suite maintainer name');
 		$suite_description = pts_user_io::prompt_user_input('Enter suite description');
 
-		$suite_writer = new pts_test_suite_writer();
-		$suite_writer->add_suite_information($suite_name, '1.0.0', $suite_maintainer, $suite_test_type, $suite_description);
+		$new_suite = new pts_test_suite();
+		$new_suite->set_title($suite_name);
+		$new_suite->set_version('1.0.0');
+		$new_suite->set_maintainer($suite_maintainer);
+		$new_suite->set_suite_type($suite_test_type);
+		$new_suite->set_description($suite_description);
+
 
-		// Read results file
 		$result_file = new pts_result_file($result_file);
-
 		foreach($result_file->get_result_objects() as $result_object)
 		{
-			$suite_writer->add_to_suite_from_result_object($result_object);
+			$test = new pts_test_profile($result_object->test_profile->get_identifier());
+			$new_suite->add_to_suite($test, $result_object->get_arguments(), $result_object->get_arguments_description());
 		}
 
 		// Finish it off
-		$suite_identifier = pts_test_run_manager::clean_save_name($suite_name);
-		mkdir(PTS_TEST_SUITE_PATH . 'local/' . $suite_identifier);
-		$save_to = PTS_TEST_SUITE_PATH . 'local/' . $suite_identifier . '/suite-definition.xml';
-
-		if($suite_writer->save_xml($save_to) != false)
+		if($new_suite->save_xml($suite_name) != false)
 		{
-			echo PHP_EOL . PHP_EOL . 'Saved To: ' . $save_to . PHP_EOL . 'To run this suite, type: phoronix-test-suite benchmark ' . $suite_identifier . PHP_EOL . PHP_EOL;
+			echo PHP_EOL . PHP_EOL . 'Saved -- to run this suite, type: phoronix-test-suite benchmark ' . $new_suite->get_identifier() . PHP_EOL . PHP_EOL;
 		}
 	}
+	public static function invalid_command($passed_args = null)
+	{
+		pts_tests::recently_saved_results();
+	}
 }
 
 ?>

pts-core/commands/run_random_tests.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2014, Phoronix Media
-	Copyright (C) 2014, Michael Larabel
+	Copyright (C) 2014 - 2015, Phoronix Media
+	Copyright (C) 2014 - 2015, Michael Larabel
 
 	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
@@ -114,16 +114,9 @@ class run_random_tests implements pts_option_interface
 				pts_client::pts_set_environment_variable('SKIP_TESTING_SUBSYSTEMS', implode(',', $subsystems_to_avoid));
 			}
 
-			$test_flags = pts_c::auto_mode | pts_c::defaults_mode | pts_c::batch_mode;
-			pts_client::set_test_flags($test_flags);
 			if($allow_new_tests_to_be_installed)
 			{
-				if($allow_new_dependencies_to_be_installed == false)
-				{
-					$test_flags |= pts_c::skip_tests_with_missing_dependencies;
-				}
-
-				pts_test_installer::standard_install($to_test, $test_flags);
+				pts_test_installer::standard_install($to_test, false, true, $allow_new_dependencies_to_be_installed);
 			}
 
 			$batch_mode_settings = array(
@@ -143,13 +136,13 @@ class run_random_tests implements pts_option_interface
 			}
 			pts_test_run_manager::set_batch_mode($batch_mode_settings);
 
-			if(pts_test_run_manager::initial_checks($to_test, $test_flags) != false)
+			$test_run_manager = new pts_test_run_manager($batch_mode_settings, 2);
+			if($test_run_manager->initial_checks($to_test) != false)
 			{
-				$test_run_manager = new pts_test_run_manager($test_flags);
 				if($test_run_manager->load_tests_to_run($to_test))
 				{
 					// SETUP
-					$test_run_manager->auto_save_results($title, null, 'Various open-source benchmarks by the ' . pts_title(true) . '.', true);
+					$test_run_manager->auto_save_results($title, null, 'Various open-source benchmarks by the ' . pts_core::program_title(true) . '.', true);
 					$test_run_manager->auto_generate_results_identifier();
 					echo PHP_EOL;
 					pts_client::$display->generic_sub_heading('Result File: ' . $test_run_manager->get_file_name());

pts-core/commands/run_test.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2008 - 2011, Phoronix Media
-	Copyright (C) 2008 - 2011, Michael Larabel
+	Copyright (C) 2008 - 2015, Phoronix Media
+	Copyright (C) 2008 - 2015, Michael Larabel
 
 	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
@@ -42,7 +42,8 @@ class run_test implements pts_option_interface
 	}
 	public static function run($to_run)
 	{
-		pts_test_run_manager::standard_run($to_run);
+		$run_manager = new pts_test_run_manager();
+		$run_manager->standard_run($to_run);
 	}
 }
 

pts-core/commands/run_tests_in_suite.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2010 - 2011, Phoronix Media
-	Copyright (C) 2010 - 2011, Michael Larabel
+	Copyright (C) 2010 - 2015, Phoronix Media
+	Copyright (C) 2010 - 2015, Michael Larabel
 
 	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
@@ -34,7 +34,8 @@ class run_tests_in_suite implements pts_option_interface
 			pts_arrays::unique_push($to_run, $test_profile);
 		}
 
-		pts_test_run_manager::standard_run($to_run);
+		$run_manager = new pts_test_run_manager();
+		$run_manager->standard_run($to_run);
 	}
 }
 

pts-core/commands/start_phoromatic_server.php

@@ -110,8 +110,8 @@ class start_phoromatic_server implements pts_option_interface
 		// Just create the logger so now it will flush it out
 		$pts_logger = new pts_logger();
 		$pts_logger->clear_log();
-		echo pts_title(true) . ' starting Phoromatic Server' . PHP_EOL;
-		$pts_logger->log(pts_title(true) . ' starting Phoromatic Server on ' . pts_network::get_local_ip());
+		echo pts_core::program_title(true) . ' starting Phoromatic Server' . PHP_EOL;
+		$pts_logger->log(pts_core::program_title(true) . ' starting Phoromatic Server on ' . pts_network::get_local_ip());
 
 		echo 'Phoronix Test Suite User-Data Directory Path: ' . PTS_USER_PATH . PHP_EOL;
 		echo 'Phoronix Test Suite Configuration File: ' . pts_config::get_config_file_location() . PHP_EOL;
@@ -134,7 +134,14 @@ class start_phoromatic_server implements pts_option_interface
 		$server_launcher .= 'event_server_pid=$!'. PHP_EOL;
 
 		// HTTP Server Setup
-		if(false && pts_client::executable_in_path('nginx') && is_file('/run/php-fpm/php-fpm.pid'))
+		if(getenv('PHOROMATIC_WANTS_APACHE'))
+		{
+			echo PHP_EOL . PHP_EOL . 'To manually configure Apache, setup the following:' . PHP_EOL;
+			echo 'The root web directory: ' . PTS_CORE_PATH . 'phoromatic/public_html/' . PHP_EOL;
+			echo 'Set the HTTP port to: ' . $web_port . PHP_EOL;
+			echo 'Of course, ensure Apache PHP support is available.' . PHP_EOL . PHP_EOL;
+		}
+		else if(false && pts_client::executable_in_path('nginx') && is_file('/run/php-fpm/php-fpm.pid'))
 		{
 			// NGINX
 			$nginx_conf = 'error_log /tmp/error.log;
@@ -186,6 +193,7 @@ class start_phoromatic_server implements pts_option_interface
 		else if(($mongoose = pts_client::executable_in_path('mongoose')) && ($php_cgi = pts_client::executable_in_path('php-cgi')))
 		{
 			// Mongoose Embedded Web Server
+			echo PHP_EOL . 'Launching with Mongoose web server.' . PHP_EOL;
 			$server_launcher .= $mongoose . ' -p ' . $web_port . ' -r ' . PTS_CORE_PATH . 'phoromatic/public_html/ -I ' . $php_cgi . ' -i index.php > /dev/null 2>> $PTS_PHOROMATIC_LOG_LOCATION &' . PHP_EOL; //2> /dev/null
 
 		}
@@ -197,6 +205,7 @@ class start_phoromatic_server implements pts_option_interface
 		else
 		{
 			// PHP Web Server
+			echo PHP_EOL . 'Launching with PHP built-in web server.' . PHP_EOL;
 			$server_launcher .= getenv('PHP_BIN') . ' -S ' . $server_ip . ':' . $web_port . ' -t ' . PTS_CORE_PATH . 'phoromatic/public_html/ > /dev/null 2>> $PTS_PHOROMATIC_LOG_LOCATION &' . PHP_EOL; //2> /dev/null
 		}
 		$server_launcher .= 'http_server_pid=$!'. PHP_EOL;

pts-core/commands/stress_run.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2015, Phoronix Media
-	Copyright (C) 2015, Michael Larabel
+	Copyright (C) 2015 - 2016, Phoronix Media
+	Copyright (C) 2015 - 2016, Michael Larabel
 
 	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
@@ -33,7 +33,7 @@ class stress_run implements pts_option_interface
 	}
 	public static function run($to_run)
 	{
-		pts_test_run_manager::set_batch_mode(array(
+		$test_run_manager = new pts_stress_run_manager(array(
 			'UploadResults' => false,
 			'SaveResults' => false,
 			'PromptForTestDescription' => false,
@@ -45,17 +45,33 @@ class stress_run implements pts_option_interface
 
 		$tests_to_run_concurrently = 2;
 
+		echo PHP_EOL . 'STRESS-RUN ENVIRONMENT VARIABLES:' . PHP_EOL;
+
 		if(($j = getenv('PTS_CONCURRENT_TEST_RUNS')) && is_numeric($j) && $j > 1)
 		{
 			$tests_to_run_concurrently = $j;
-			echo 'PTS_CONCURRENT_TEST_RUNS set; running ' . $tests_to_run_concurrently . ' tests concurrently.' . PHP_EOL;
+			echo PHP_EOL . 'PTS_CONCURRENT_TEST_RUNS set; running ' . $tests_to_run_concurrently . ' tests concurrently.' . PHP_EOL . PHP_EOL;
+		}
+		else
+		{
+			echo PHP_EOL . 'PTS_CONCURRENT_TEST_RUNS: Set the PTS_CONCURRENT_TEST_RUNS environment variable to specify how many tests should be run concurrently during the stress-run process. If not specified, defaults to 2.' . PHP_EOL . PHP_EOL;
 		}
 
-		$test_flags = pts_c::batch_mode;
-
-		if(pts_test_run_manager::initial_checks($to_run, $test_flags, 'SHORT') == false)
+		// Run the actual tests
+		$total_loop_time = pts_client::read_env('TOTAL_LOOP_TIME');
+		if($total_loop_time == 'infinite')
 		{
-			return false;
+			$total_loop_time = 'infinite';
+			echo PHP_EOL . 'TOTAL_LOOP_TIME set; running tests in an infinite loop until otherwise triggered' . PHP_EOL . PHP_EOL;
+		}
+		else if($total_loop_time && is_numeric($total_loop_time) && $total_loop_time > 1)
+		{
+			echo PHP_EOL . 'TOTAL_LOOP_TIME set; running tests for ' . $total_loop_time . ' minutes' . PHP_EOL . PHP_EOL;
+		}
+		else
+		{
+			echo PHP_EOL . 'TOTAL_LOOP_TIME: Set the TOTAL_LOOP_TIME environment variable if wishing to specify (in minutes) how long to run the stress-run process.' . PHP_EOL . PHP_EOL;
+			$total_loop_time = false;
 		}
 
 		/*
@@ -66,7 +82,10 @@ class stress_run implements pts_option_interface
 		}
 		*/
 
-		$test_run_manager = new pts_test_run_manager($test_flags);
+		if($test_run_manager->initial_checks($to_run, 'SHORT') == false)
+		{
+			return false;
+		}
 
 		// Load the tests to run
 		if($test_run_manager->load_tests_to_run($to_run) == false)
@@ -74,22 +93,6 @@ class stress_run implements pts_option_interface
 			return false;
 		}
 
-		// Run the actual tests
-		$total_loop_time = pts_client::read_env('TOTAL_LOOP_TIME');
-		if($total_loop_time == 'infinite')
-		{
-			$total_loop_time = 'infinite';
-			echo 'TOTAL_LOOP_TIME set; running tests in an infinite loop until otherwise triggered' . PHP_EOL;
-		}
-		else if($total_loop_time && is_numeric($total_loop_time) && $total_loop_time > 9)
-		{
-			$total_loop_time = $total_loop_time * 60;
-			echo 'TOTAL_LOOP_TIME set; running tests for ' . ($total_loop_time / 60) . ' minutes' . PHP_EOL;
-		}
-		else
-		{
-			$total_loop_time = false;
-		}
 		//$test_run_manager->pre_execution_process();
 		$test_run_manager->multi_test_stress_run_execute($tests_to_run_concurrently, $total_loop_time);
 	}

pts-core/commands/system_sensors.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2010, Phoronix Media
-	Copyright (C) 2009 - 2010, Michael Larabel
+	Copyright (C) 2009 - 2016, Phoronix Media
+	Copyright (C) 2009 - 2016, Michael Larabel
 
 	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
@@ -30,7 +30,17 @@ class system_sensors implements pts_option_interface
 		pts_client::$display->generic_heading('Supported Sensors');
 		foreach(phodevi::supported_sensors() as $sensor)
 		{
-			echo phodevi::sensor_name($sensor) . ': ' . phodevi::read_sensor($sensor) . ' ' . phodevi::read_sensor_unit($sensor) . PHP_EOL;
+			$supported_devices = call_user_func(array($sensor[2], 'get_supported_devices'));
+
+			if($supported_devices === NULL)
+			{
+				$supported_devices = array(null);
+			}
+
+			foreach($supported_devices as $device)
+			{
+				self::print_sensor($sensor, $device);
+			}
 		}
 
 		pts_client::$display->generic_heading('Unsupported Sensors');
@@ -40,6 +50,19 @@ class system_sensors implements pts_option_interface
 		}
 		echo PHP_EOL;
 	}
+
+	private static function print_sensor($sensor, $device)
+	{
+		if($sensor[0] === 'cgroup')
+		{
+			echo '- ' . phodevi::sensor_name($sensor) . PHP_EOL;
+		}
+		else
+		{
+			$sensor_object = new $sensor[2](0, $device);
+			echo '- ' . phodevi::sensor_object_name($sensor_object) . ': ' . phodevi::read_sensor($sensor_object) . ' ' . phodevi::read_sensor_object_unit($sensor_object) . PHP_EOL;	
+		}
+	}
 }
 
 ?>

pts-core/commands/upload_test_profile.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2010 - 2013, Phoronix Media
-	Copyright (C) 2010 - 2013, Michael Larabel
+	Copyright (C) 2010 - 2015, Phoronix Media
+	Copyright (C) 2010 - 2015, Michael Larabel
 
 	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
@@ -35,7 +35,7 @@ class upload_test_profile implements pts_option_interface
 			return false;
 		}
 
-		foreach(pts_types::identifiers_to_test_profile_objects($r, true, true) as $test_profile)
+		foreach(pts_types::identifiers_to_test_profile_objects($r, false, true) as $test_profile)
 		{
 			// validate_test_profile
 			if(pts_validation::validate_test_profile($test_profile))

pts-core/commands/upload_test_suite.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2010 - 2015, Phoronix Media
-	Copyright (C) 2010 - 2015, Michael Larabel
+	Copyright (C) 2010 - 2016, Phoronix Media
+	Copyright (C) 2010 - 2016, Michael Larabel
 
 	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
@@ -39,10 +39,10 @@ class upload_test_suite implements pts_option_interface
 		{
 			pts_client::$display->generic_heading($r[0]);
 
-			if(pts_validation::validate_test_suite($test_suite))
+			if(pts_validation::validate_test_suite($test_suite) && $test_suite->get_file_location() != null)
 			{
 				$zip_file = PTS_OPENBENCHMARKING_SCRATCH_PATH . $test_suite->get_identifier(false) . '-' . $test_suite->get_version() . '.zip';
-				$zip_created = pts_compression::zip_archive_create($zip_file, $test_suite->xml_parser->getFileLocation());
+				$zip_created = pts_compression::zip_archive_create($zip_file, $test_suite->get_file_location());
 
 				if($zip_created == false)
 				{
@@ -50,11 +50,6 @@ class upload_test_suite implements pts_option_interface
 					return false;
 				}
 
-				$zip = new ZipArchive();
-				$zip->open($zip_file);
-				$zip->renameName(basename($test_suite->xml_parser->getFileLocation()), 'suite-definition.xml');
-				$zip->close();
-
 				$commit_description = pts_user_io::prompt_user_input('Enter a test commit description', false);
 
 				echo PHP_EOL;

pts-core/commands/validate_result_file.php

@@ -3,8 +3,8 @@
 /*
 	Phoronix Test Suite
 	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-	Copyright (C) 2009 - 2011, Phoronix Media
-	Copyright (C) 2009 - 2011, Michael Larabel
+	Copyright (C) 2009 - 2015, Phoronix Media
+	Copyright (C) 2009 - 2015, Michael Larabel
 
 	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
@@ -31,7 +31,7 @@ class validate_result_file implements pts_option_interface
 		{
 			$result_file = new pts_result_file($r[0]);
 			pts_client::$display->generic_heading($r[0]);
-			$valid = $result_file->xml_parser->validate();
+			$valid = $result_file->validate();
 
 			if($valid == false)
 			{

pts-core/external-test-dependencies/dependency-handlers/arch_dependency_handler.php

@@ -0,0 +1,92 @@
+<?php
+
+/*
+	Phoronix Test Suite
+	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
+	Copyright (C) 2015, Phoronix Media
+	Copyright (C) 2015, Michael Larabel
+
+	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
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class arch_dependency_handler implements pts_dependency_handler
+{
+	public static function what_provides($files_needed)
+	{
+		$packages_needed = array();
+		foreach(pts_arrays::to_array($files_needed) as $file)
+		{
+			if(pts_client::executable_in_path('pkgfile'))
+			{
+				$pkgfile_provides = self::run_pkgfile_provides($file);
+				if($pkgfile_provides != null)
+				{
+					$packages_needed[$file] = $pkgfile_provides;
+				}
+				else
+				{
+					// Try appending common paths
+					if(strpos($file, '.h') !== false)
+					{
+						$pkgfile_provides = self::run_pkgfile_provides('/usr/include/' . $file);
+						if($pkgfile_provides != null)
+						{
+							$packages_needed[$file] = $pkgfile_provides;
+						}
+					}
+					else if(strpos($file, '.so') !== false)
+					{
+						$pkgfile_provides = self::run_pkgfile_provides('/usr/lib/' . $file);
+						if($pkgfile_provides != null)
+						{
+							$packages_needed[$file] = $pkgfile_provides;
+						}
+					}
+					else
+					{
+						foreach(array('/usr/bin/', '/bin/', '/usr/sbin') as $possible_path)
+						{
+							$pkgfile_provides = self::run_pkgfile_provides($possible_path . $file);
+							if($pkgfile_provides != null)
+							{
+								$packages_needed[$file] = $pkgfile_provides;
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+		return $packages_needed;
+	}
+	protected static function run_pkgfile_provides($arg)
+	{
+		$pkgfile_output = shell_exec('pkgfile ' . $arg . ' 2>/dev/null');
+
+		foreach(explode(PHP_EOL, $pkgfile_output) as $line)
+		{
+			$line = trim($line);
+			if(!empty($line))
+			{
+				return $line;
+			}
+		}
+
+		return null;
+	}
+}
+
+
+?>
+

pts-core/external-test-dependencies/dependency-handlers/fedora_dependency_handler.php

@@ -0,0 +1,109 @@
+<?php
+
+/*
+	Phoronix Test Suite
+	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
+	Copyright (C) 2015, Phoronix Media
+	Copyright (C) 2015, Michael Larabel
+
+	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
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class fedora_dependency_handler implements pts_dependency_handler
+{
+	public static function what_provides($files_needed)
+	{
+		$packages_needed = array();
+		foreach(pts_arrays::to_array($files_needed) as $file)
+		{
+			if(pts_client::executable_in_path('dnf'))
+			{
+				$dnf_provides = self::run_dnf_provides($file);
+				if($dnf_provides != null)
+				{
+					$packages_needed[$file] = $dnf_provides;
+				}
+				else
+				{
+					// Try appending common paths
+					if(strpos($file, '.h') !== false)
+					{
+						$dnf_provides = self::run_dnf_provides('/usr/include/' . $file);
+						if($dnf_provides != null)
+						{
+							$packages_needed[$file] = $dnf_provides;
+						}
+					}
+					else if(strpos($file, '.so') !== false)
+					{
+						$dnf_provides = self::run_dnf_provides('/usr/lib/' . $file);
+						if($dnf_provides != null)
+						{
+							$packages_needed[$file] = $dnf_provides;
+						}
+					}
+					else
+					{
+						foreach(array('/usr/bin/', '/bin/', '/usr/sbin') as $possible_path)
+						{
+							$dnf_provides = self::run_dnf_provides($possible_path . $file);
+							if($dnf_provides != null)
+							{
+								$packages_needed[$file] = $dnf_provides;
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+		return $packages_needed;
+	}
+	protected static function run_dnf_provides($arg)
+	{
+		$dnf_output = shell_exec('dnf --quiet provides ' . $arg . ' 2>/dev/null');
+
+		foreach(explode(PHP_EOL, $dnf_output) as $line)
+		{
+			if(($x = strpos($line, ' : ')) == false)
+			{
+				continue;
+			}
+			$line = trim(substr($line, 0, $x));
+
+			if(strpos($line, '-') !== false && strpos($line, '.') !== false && strpos($line, ' ') === false)
+			{
+				// Don't mess with the version/arch stuff, etc, so try to strip it off
+				$offset = 0;
+				while(($x = strpos($line, '-', $offset)) !== false)
+				{
+					if(isset($line[($x + 1)]) && is_numeric($line[($x + 1)]))
+					{
+						$line = substr($line, 0, $x);
+						break;
+					}
+					$offset = $x + 1;
+				}
+
+				return $line;
+			}
+		}
+
+		return null;
+	}
+}
+
+
+?>
+

pts-core/external-test-dependencies/dependency-handlers/opensuse_dependency_handler.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+	Phoronix Test Suite
+	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
+	Copyright (C) 2015 - 2016, Phoronix Media
+	Copyright (C) 2015 - 2016, Michael Larabel
+
+	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
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class opensuse_dependency_handler implements pts_dependency_handler
+{
+	public static function what_provides($files_needed)
+	{
+		$packages_needed = array();
+		foreach(pts_arrays::to_array($files_needed) as $file)
+		{
+			if(pts_client::executable_in_path('zypper'))
+			{
+				$zypper_provides = self::run_zypper_provides($file);
+				if($zypper_provides != null)
+				{
+					$packages_needed[$file] = $zypper_provides;
+				}
+			}
+		}
+		return $packages_needed;
+	}
+	protected static function run_zypper_provides($arg)
+	{
+		$line = shell_exec('zypper search --provides --match-exact ' . $arg . ' 2>/dev/null');
+
+		if(($x = strpos($line, '-----')) == false)
+		{
+			return null;
+		}
+		$line = substr($line, $x);
+		$line = substr($line, strpos($line, "\n") + 2);
+		$line = trim(substr($line, 0, strpos($line, PHP_EOL)));
+		$parts = explode('|', $line);
+
+		if(isset($parts[1]))
+		{
+			return trim($parts[1]);
+		}
+		return null;
+	}
+}
+
+
+?>
+

pts-core/external-test-dependencies/dependency-handlers/ubuntu_dependency_handler.php

@@ -0,0 +1,90 @@
+<?php
+
+/*
+	Phoronix Test Suite
+	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
+	Copyright (C) 2015, Phoronix Media
+	Copyright (C) 2015, Michael Larabel
+
+	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
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class ubuntu_dependency_handler implements pts_dependency_handler
+{
+	public static function what_provides($files_needed)
+	{
+		$packages_needed = array();
+		foreach(pts_arrays::to_array($files_needed) as $file)
+		{
+			if(pts_client::executable_in_path('apt-file'))
+			{
+				if(!defined('APT_FILE_UPDATED'))
+				{
+					shell_exec('apt-file update 2>&1');
+					define('APT_FILE_UPDATED', 1);
+				}
+
+				// Try appending common paths
+				if(strpos($file, '.h') !== false)
+				{
+					$apt_provides = self::run_apt_file_provides('/usr/include/' . $file);
+					if($apt_provides != null)
+					{
+						$packages_needed[$file] = $apt_provides;
+					}
+				}
+				else if(strpos($file, '.so') !== false)
+				{
+					$apt_provides = self::run_apt_file_provides('/usr/lib/' . $file);
+					if($apt_provides != null)
+					{
+						$packages_needed[$file] = $apt_provides;
+					}
+				}
+				else
+				{
+					foreach(array('/usr/bin/', '/bin/', '/usr/sbin') as $possible_path)
+						{
+						$apt_provides = self::run_apt_file_provides($possible_path . $file);
+						if($apt_provides != null)
+						{
+							$packages_needed[$file] = $apt_provides;
+							break;
+						}
+					}
+				}
+			}
+		}
+		return $packages_needed;
+	}
+	protected static function run_apt_file_provides($arg)
+	{
+		$apt_output = shell_exec('apt-file -N search --regex "' . $arg . '$" 2>/dev/null');
+
+		foreach(explode(PHP_EOL, $apt_output) as $line)
+		{
+			if(($x = strpos($line, ': ')) == false)
+			{
+				continue;
+			}
+			return trim(substr($line, 0, $x));
+		}
+
+		return null;
+	}
+}
+
+
+?>
+

pts-core/external-test-dependencies/scripts/install-alpine-packages.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Alpine Linux package installation
+
+echo "Please enter your root password below:" 1>&2
+su root -c "apk add -v $*"
+exit

pts-core/external-test-dependencies/scripts/install-arch-packages.sh

@@ -3,5 +3,5 @@
 # Arch package installation
 
 echo "Please enter your root password below:" 1>&2
-su root -c "pacman -Sy --noconfirm $*"
+su root -c "pacman -Sy --noconfirm --needed $*"
 exit

pts-core/external-test-dependencies/scripts/install-dragonfly-packages.sh

@@ -1,37 +1,5 @@
 #!/bin/sh
 
-# DragonFlyBSD pkgsrc package installation
+#dports pkg
+pkg install -y $*
 
-echo "For now with this test profile script, please run: phoronix-test-suite install-dependencies xxx as root."
-
-# Check that pkgsrc is setup, below code should work for making sure good state with at least DragonFlyBSD
-if [ -d /usr/pkgsrc ] && [ ! -d /usr/pkgsrc/devel ];
-then
-	cd /usr
-
-	if [ -d /usr/pkgsrc/.git ];
-	then
-		make pkgsrc-update
-	else
-		make pkgsrc-create
-	fi
-fi
-
-if [ -d /usr/pkgsrc ]
-then
-	for portdir in $*
-	do
-		if [ -d /usr/pkgsrc/$portdir ];
-		then
-			cd /usr/pkgsrc/$portdir
-			bmake install clean BATCH="yes"
-		fi
-	done
-elif [ -x /usr/local/sbin/pkg ]
-then
-	for portdir in $*
-	do
-		# DragonFlyBSD 3.6 now uses dports by default and this method seems to work fine for hitting most packages based upon earlier pkgsrc basename
-		pkg install -y `basename $portdir`
-	done
-fi

pts-core/external-test-dependencies/scripts/install-solus-packages.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Pardus package installation
+
+echo "Please enter your root password below:" 1>&2
+su root -c "pisi install --ignore-safety --yes-all $*"
+exit

pts-core/external-test-dependencies/scripts/install-void-packages.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+ 
+# Void Linux package installation
+
+echo "Please enter your root password below:" 1>&2 
+su root -c "xbps-install -Sy $*"
+exit

pts-core/external-test-dependencies/xml/alpine-packages.xml

@@ -0,0 +1,200 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="xsl/pts-exdep-viewer.xsl" ?>
+<PhoronixTestSuite>
+	<ExternalDependencies>
+		<Information>
+			<Name>Alpine Linux</Name>
+			<Aliases></Aliases>
+			<PackageManager>apk</PackageManager>
+		</Information>
+		<Package>
+			<GenericName>common-dependencies</GenericName>
+			<PackageName>unzip</PackageName>
+			<FileCheck>unzip</FileCheck>
+		</Package>
+		<Package>
+			<GenericName>gtk-development</GenericName>
+			<PackageName>gtk+ gtk+2.0 gtk+3.0</PackageName>
+		</Package>
+		<Package>
+			<GenericName>sdl2-development</GenericName>
+			<PackageName>sdl sdl_image sdl_mixer</PackageName>
+		</Package>
+		<Package>
+			<GenericName>sdl-development</GenericName>
+			<PackageName>sdl sdl_image sdl_mixer</PackageName>
+		</Package>
+		<Package>
+			<GenericName>glut</GenericName>
+			<PackageName>freeglut</PackageName>
+		</Package>
+		<Package>
+			<GenericName>libpng-development</GenericName>
+			<PackageName>libpng</PackageName>
+		</Package>
+		<Package>
+			<GenericName>openssl-development</GenericName>
+			<PackageName>openssl</PackageName>
+		</Package>
+		<Package>
+			<GenericName>build-utilities</GenericName>
+			<PackageName>gcc make build-base automake autoconf</PackageName>
+		</Package>
+		<Package>
+			<GenericName>cairo-development</GenericName>
+			<PackageName>cairo</PackageName>
+		</Package>
+		<Package>
+			<GenericName>xorg-development</GenericName>
+			<PackageName>xorg-server</PackageName>
+		</Package>
+		<Package>
+			<GenericName>tiff</GenericName>
+			<PackageName>tiff</PackageName>
+		</Package>
+		<Package>
+			<GenericName>bison</GenericName>
+			<PackageName>bison</PackageName>
+		</Package>
+		<Package>
+			<GenericName>flex</GenericName>
+			<PackageName>flex</PackageName>
+		</Package>
+		<Package>
+			<GenericName>imlib2-development</GenericName>
+			<PackageName>imlib2</PackageName>
+		</Package>
+		<Package>
+			<GenericName>java</GenericName>
+			<PackageName>java-common</PackageName>
+		</Package>
+		<Package>
+			<GenericName>portaudio-development</GenericName>
+			<PackageName>portaudio</PackageName>
+		</Package>
+		<Package>
+			<GenericName>fortran-compiler</GenericName>
+			<PackageName>gfortran</PackageName>
+		</Package>
+		<Package>
+			<GenericName>glew</GenericName>
+			<PackageName>glew</PackageName>
+		</Package>
+		<Package>
+			<GenericName>bc</GenericName>
+			<PackageName>bc</PackageName>
+		</Package>
+		<Package>
+			<GenericName>scons</GenericName>
+			<PackageName>scons</PackageName>
+		</Package>
+		<Package>
+			<GenericName>smartmontools</GenericName>
+			<PackageName>smartmontools</PackageName>
+		</Package>
+		<Package>
+			<GenericName>zlib-development</GenericName>
+			<PackageName>zlib</PackageName>
+		</Package>
+		<Package>
+			<GenericName>jpeg-development</GenericName>
+			<PackageName>libjpeg-turbo</PackageName>
+		</Package>
+		<Package>
+			<GenericName>libaio-development</GenericName>
+			<PackageName>libaio</PackageName>
+		</Package>
+		<Package>
+			<GenericName>pcre</GenericName>
+			<PackageName>pcre</PackageName>
+		</Package>
+		<Package>
+			<GenericName>perl</GenericName>
+			<PackageName>perl</PackageName>
+		</Package>
+		<Package>
+			<GenericName>vorbis-development</GenericName>
+			<PackageName>libvorbis</PackageName>
+		</Package>
+		<Package>
+			<GenericName>p7zip</GenericName>
+			<PackageName>p7zip</PackageName>
+		</Package>
+		<Package>
+			<GenericName>autoconf</GenericName>
+			<PackageName>autoconf</PackageName>
+		</Package>
+		<Package>
+			<GenericName>libtool</GenericName>
+			<PackageName>libtool</PackageName>
+		</Package>
+		<Package>
+			<GenericName>ncurses-development</GenericName>
+			<PackageName>ncurses</PackageName>
+		</Package>
+		<Package>
+			<GenericName>popt</GenericName>
+			<PackageName>popt</PackageName>
+		</Package>
+		<Package>
+			<GenericName>curl</GenericName>
+			<PackageName>curl</PackageName>
+		</Package>
+		<Package>
+			<GenericName>fftw3-development</GenericName>
+			<PackageName>fftw</PackageName>
+		</Package>
+		<Package>
+			<GenericName>cmake</GenericName>
+			<PackageName>cmake</PackageName>
+		</Package>
+		<Package>
+			<GenericName>boost-development</GenericName>
+			<PackageName>boost</PackageName>
+		</Package>
+		<Package>
+			<GenericName>bzip2-development</GenericName>
+			<PackageName>bzip2</PackageName>
+		</Package>
+		<Package>
+			<GenericName>tcl</GenericName>
+			<PackageName>tcl</PackageName>
+		</Package>
+		<Package>
+			<GenericName>glibc-development</GenericName>
+			<PackageName>libc-dev</PackageName>
+		</Package>
+		<Package>
+			<GenericName>python</GenericName>
+			<PackageName>python</PackageName>
+		</Package>
+		<Package>
+			<GenericName>yasm</GenericName>
+			<PackageName>yasm</PackageName>
+		</Package>
+		<Package>
+			<GenericName>gmp-library</GenericName>
+			<PackageName>gmp</PackageName>
+		</Package>
+		<Package>
+			<GenericName>subversion</GenericName>
+			<PackageName>subversion</PackageName>
+		</Package>
+		<Package>
+			<GenericName>git</GenericName>
+			<PackageName>git</PackageName>
+		</Package>
+		<Package>
+			<GenericName>tinyxml</GenericName>
+			<PackageName>libtinyxml</PackageName>
+		</Package>
+		<Package>
+			<GenericName>attr</GenericName>
+			<PackageName>attr</PackageName>
+		</Package>
+		<Package>
+			<GenericName>httpd</GenericName>
+			<PackageName>apache2</PackageName>
+		</Package>
+	</ExternalDependencies>
+</PhoronixTestSuite>

pts-core/external-test-dependencies/xml/arch-packages.xml

@@ -36,7 +36,7 @@
 		</Package>
 		<Package>
 			<GenericName>build-utilities</GenericName>
-			<PackageName>gcc</PackageName>
+			<PackageName>gcc make autoconf</PackageName>
 			<FileCheck>g++</FileCheck>
 		</Package>
 		<Package>
@@ -51,6 +51,10 @@
 			<GenericName>bison</GenericName>
 			<PackageName>bison</PackageName>
 		</Package>
+		<Package>
+			<GenericName>smartmontools</GenericName>
+			<PackageName>smartmontools</PackageName>
+		</Package>
 		<Package>
 			<GenericName>flex</GenericName>
 			<PackageName>flex</PackageName>
@@ -69,7 +73,7 @@
 		</Package>
 		<Package>
 			<GenericName>fortran-compiler</GenericName>
-			<PackageName>gcc-fortran</PackageName>
+			<PackageName>gcc-fortran-multilib</PackageName>
 		</Package>
 		<Package>
 			<GenericName>glew</GenericName>
@@ -222,5 +226,29 @@
 			<GenericName>attr</GenericName>
 			<PackageName>attr</PackageName>
 		</Package>
+		<Package>
+			<GenericName>httpd</GenericName>
+			<PackageName>apache</PackageName>
+		</Package>
+                <Package>
+			<GenericName>redis-server</GenericName>
+			<PackageName>redis</PackageName>
+		</Package>
+                <Package>
+			<GenericName>opencv</GenericName>
+			<PackageName>opencv</PackageName>
+		</Package>
+		<Package>
+                        <GenericName>perl-digest-md5</GenericName>
+                        <PackageName>perl-digest-md5-file perl6-digest-md5</PackageName>
+                </Package>
+		<Package>
+			<GenericName>python-scipy</GenericName>
+			<PackageName>python2-scipy</PackageName>
+		</Package>
+		<Package>
+			<GenericName>python-sklearn</GenericName>
+			<PackageName>python2-scikit-learn</PackageName>
+		</Package>
 	</ExternalDependencies>
 </PhoronixTestSuite>

pts-core/external-test-dependencies/xml/dragonfly-packages.xml

@@ -4,236 +4,148 @@
 	<ExternalDependencies>
 		<Information>
 			<Name>DragonFlyBSD</Name>
+			<PackageManager>pkg</PackageManager>
 		</Information>
 		<Package>
 			<GenericName>common-dependencies</GenericName>
-			<PackageName>archivers/unzip</PackageName>
+			<PackageName>unzip</PackageName>
 			<FileCheck>unzip</FileCheck>
 		</Package>
-		<Package>
-			<GenericName>gtk-development</GenericName>
-			<PackageName>x11/gtk2</PackageName>
-			<FileCheck>/usr/pkg/include/gtk-2.0/</FileCheck>
-		</Package>
 		<Package>
 			<GenericName>sdl-development</GenericName>
-			<PackageName>devel/SDL devel/SDL_gfx devel/SDL_image</PackageName>
-			<FileCheck>/usr/pkg/include/SDL/SDL.h, /usr/pkg/include/SDL/SDL_image.h</FileCheck>
+			<PackageName>SDL</PackageName>
 		</Package>
 		<Package>
 			<GenericName>sdl2-development</GenericName>
-			<PackageName>devel/SDL2 devel/SDL2_gfx devel/SDL2_image</PackageName>
-			<FileCheck>/usr/pkg/include/SDL2/SDL.h, /usr/pkg/include/SDL2/SDL_image.h</FileCheck>
+			<PackageName>SDL2</PackageName>
 		</Package>
 		<Package>
 			<GenericName>libpng-development</GenericName>
-			<PackageName>graphics/png</PackageName>
-			<FileCheck>/usr/pkg/include/png.h</FileCheck>
+			<PackageName>png</PackageName>
 		</Package>
 		<Package>
 			<GenericName>openssl-development</GenericName>
-			<PackageName>security/openssl</PackageName>
-			<FileCheck>/usr/pkg/include/openssl/ssl.h</FileCheck>
+			<PackageName>openssl</PackageName>
 		</Package>
 		<Package>
 			<GenericName>build-utilities</GenericName>
-			<PackageName>devel/autoconf</PackageName>
-			<FileCheck>/usr/pkg/bin/autoconf</FileCheck>
+			<PackageName>autoconf</PackageName>
 		</Package>
 		<Package>
 			<GenericName>pcre</GenericName>
-			<PackageName>devel/pcre</PackageName>
-			<FileCheck>/usr/pkg/include/pcre.h</FileCheck>
-		</Package>
-		<Package>
-			<GenericName>cairo-development</GenericName>
-			<PackageName>graphics/cairo</PackageName>
-			<FileCheck>/usr/pkg/include/cairo/cairo.h</FileCheck>
+			<PackageName>pcre</PackageName>
 		</Package>
 		<Package>
 			<GenericName>bison</GenericName>
-			<PackageName>devel/bison</PackageName>
-			<FileCheck>/usr/pkg/bin/bison</FileCheck>
+			<PackageName>bison</PackageName>
 		</Package>
 		<Package>
 			<GenericName>imlib2-development</GenericName>
-			<PackageName>graphics/imlib2</PackageName>
-			<FileCheck>/usr/pkg/lib/imlib2/</FileCheck>
+			<PackageName>imlib2</PackageName>
 		</Package>
 		<Package>
 			<GenericName>portaudio-development</GenericName>
-			<PackageName>audio/portaudio</PackageName>
-			<FileCheck>/usr/pkg/include/portaudio.h</FileCheck>
-		</Package>
-		<Package>
-			<GenericName>fortran-compiler</GenericName>
-			<PackageName>lang/g95</PackageName>
-			<FileCheck>/usr/pkg/bin/g95</FileCheck>
-		</Package>
-		<Package>
-			<GenericName>glew</GenericName>
-			<PackageName>graphics/glew</PackageName>
-			<FileCheck>/usr/pkg/include/GL/glew.h</FileCheck>
-		</Package>
-		<Package>
-			<GenericName>lib3ds</GenericName>
-			<PackageName>graphics/lib3ds</PackageName>
-			<FileCheck>/usr/pkg/include/lib3ds/io.h</FileCheck>
+			<PackageName>portaudio</PackageName>
 		</Package>
 		<Package>
 			<GenericName>scons</GenericName>
-			<PackageName>devel/scons</PackageName>
-			<FileCheck>/usr/pkg/bin/scons</FileCheck>
+			<PackageName>scons</PackageName>
 		</Package>
 		<Package>
 			<GenericName>jpeg-development</GenericName>
-			<PackageName>graphics/jpeg</PackageName>
-			<FileCheck>/usr/pkg/include/jpeglib.h</FileCheck>
+			<PackageName>jpeg</PackageName>
 		</Package>
 		<Package>
 			<GenericName>perl</GenericName>
-			<PackageName>lang/perl5</PackageName>
-			<FileCheck>/usr/pkg/bin/perl</FileCheck>
-		</Package>
-		<Package>
-			<GenericName>openal-development</GenericName>
-			<PackageName>audio/openal</PackageName>
-			<FileCheck>/usr/pkg/include/AL/al.h</FileCheck>
+			<PackageName>perl5</PackageName>
 		</Package>
 		<Package>
 			<GenericName>vorbis-development</GenericName>
-			<PackageName>audio/libvorbis</PackageName>
-			<FileCheck>/usr/pkg/include/vorbis/vorbisfile.h</FileCheck>
+			<PackageName>libvorbis</PackageName>
 		</Package>
 		<Package>
 			<GenericName>jam</GenericName>
-			<PackageName>devel/jam</PackageName>
-			<FileCheck>/usr/pkg/bin/jam</FileCheck>
+			<PackageName>jam</PackageName>
 		</Package>
 		<Package>
 			<GenericName>p7zip</GenericName>
-			<PackageName>archivers/p7zip</PackageName>
-			<FileCheck>/usr/pkg/bin/7za</FileCheck>
-		</Package>
-		<Package>
-			<GenericName>qt4-development</GenericName>
-			<PackageName>x11/qt4</PackageName>
-			<FileCheck>/usr/pkg/include/qt4/Qt/qgl.h</FileCheck>
+			<PackageName>p7zip</PackageName>
 		</Package>
 		<Package>
 			<GenericName>autoconf</GenericName>
-			<PackageName>devel/autoconf</PackageName>
-			<FileCheck>/usr/pkg/bin/autoconf</FileCheck>
+			<PackageName>autoconf</PackageName>
 		</Package>
 		<Package>
 			<GenericName>libtool</GenericName>
-			<PackageName>devel/libtool</PackageName>
-			<FileCheck>/usr/pkg/bin/libtool</FileCheck>
+			<PackageName>libtool</PackageName>
 		</Package>
 		<Package>
 			<GenericName>ncurses-development</GenericName>
-			<PackageName>devel/ncurses</PackageName>
-			<FileCheck>/usr/pkg/include/ncurses/ncurses.h</FileCheck>
+			<PackageName>ncurses</PackageName>
 		</Package>
 		<Package>
 			<GenericName>popt</GenericName>
-			<PackageName>devel/popt</PackageName>
-			<FileCheck>/usr/pkg/include/popt.h</FileCheck>
+			<PackageName>popt</PackageName>
 		</Package>
 		<Package>
 			<GenericName>fftw3-development</GenericName>
-			<PackageName>math/fftw</PackageName>
-			<FileCheck>/usr/pkg/include/fftw3.h</FileCheck>
+			<PackageName>fftw3</PackageName>
 		</Package>
 		<Package>
 			<GenericName>blas-development</GenericName>
-			<PackageName>math/blas</PackageName>
-			<FileCheck>/usr/pkg/lib/libblas.so</FileCheck>
+			<PackageName>blas</PackageName>
 		</Package>
 		<Package>
 			<GenericName>lapack-development</GenericName>
-			<PackageName>math/lapack</PackageName>
-			<FileCheck>/usr/pkg/lib/liblapack.so</FileCheck>
+			<PackageName>lapack</PackageName>
 		</Package>
 		<Package>
 			<GenericName>cmake</GenericName>
-			<PackageName>devel/cmake</PackageName>
-			<FileCheck>/usr/pkg/bin/cmake</FileCheck>
-		</Package>
-		<Package>
-			<GenericName>boost-development</GenericName>
-			<PackageName>devel/boost-build devel/boost-headers devel/boost-libs</PackageName>
-			<FileCheck>/usr/pkg/include/boost/iostreams/write.hpp</FileCheck>
+			<PackageName>cmake</PackageName>
 		</Package>
 		<Package>
 			<GenericName>bzip2-development</GenericName>
-			<PackageName>archivers/bzip2</PackageName>
-			<FileCheck>/usr/pkg/include/bzlib.h</FileCheck>
-		</Package>
-		<Package>
-			<GenericName>tcl</GenericName>
-			<PackageName>devel/tcllib</PackageName>
-			<FileCheck>/usr/pkg/bin/tclsh8.5</FileCheck>
+			<PackageName>bzip2</PackageName>
 		</Package>
 		<Package>
 			<GenericName>python</GenericName>
-			<PackageName>lang/python33</PackageName>
-			<FileCheck>/usr/pkg/bin/python</FileCheck>
-		</Package>
-		<Package>
-			<GenericName>python-boost-development</GenericName>
-			<PackageName>devel/boost-python</PackageName>
-			<FileCheck>/usr/pkg/include/boost/python.hpp</FileCheck>
+			<PackageName>python3</PackageName>
 		</Package>
 		<Package>
 			<GenericName>yasm</GenericName>
-			<PackageName>devel/yasm</PackageName>
-			<FileCheck>/usr/pkg/bin/yasm</FileCheck>
+			<PackageName>yasm</PackageName>
 		</Package>
 		<Package>
 			<GenericName>gmp-library</GenericName>
-			<PackageName>math/fgmp</PackageName>
-			<FileCheck>/usr/pkg/include/gmp.h</FileCheck>
+			<PackageName>fgmp</PackageName>
 		</Package>
 		<Package>
 			<GenericName>subversion</GenericName>
-			<PackageName>devel/subversion</PackageName>
-			<FileCheck>/usr/pkg/bin/svn</FileCheck>
+			<PackageName>subversion</PackageName>
 		</Package>
 		<Package>
 			<GenericName>superlu</GenericName>
-			<PackageName>math/superlu</PackageName>
-			<FileCheck>/usr/pkg/include/superlu/</FileCheck>
-		</Package>
-		<Package>
-			<GenericName>glut</GenericName>
-			<PackageName>graphics/glut</PackageName>
-			<FileCheck>/usr/pkg/include/GL/glut.h</FileCheck>
-		</Package>
-		<Package>
-			<GenericName>csh</GenericName>
-			<PackageName>shells/tcsh</PackageName>
-			<FileCheck>/usr/local/bin/tcsh</FileCheck>
+			<PackageName>superlu</PackageName>
 		</Package>
 		<Package>
 			<GenericName>flex</GenericName>
-			<PackageName>devel/flex</PackageName>
-			<FileCheck>/usr/pkg/bin/flex</FileCheck>
+			<PackageName>flex</PackageName>
 		</Package>
 		<Package>
 			<GenericName>curl</GenericName>
-			<PackageName>www/curl</PackageName>
-			<FileCheck>/usr/pkg/bin/curl</FileCheck>
+			<PackageName>curl</PackageName>
 		</Package>
 		<Package>
 			<GenericName>openmpi-development</GenericName>
-			<PackageName>parallel/openmpi parallel/mpi-ch</PackageName>
-			<FileCheck>/usr/pkg/mpi/openmpi/lib, /usr/pkg/include/mpicxx.h</FileCheck>
+			<PackageName>openmpi</PackageName>
 		</Package>
 		<Package>
 			<GenericName>git</GenericName>
-			<PackageName>misc/git</PackageName>
-			<FileCheck>/usr/pkg/bin/git</FileCheck>
+			<PackageName>git</PackageName>
+		</Package>
+		<Package>
+			<GenericName>httpd</GenericName>
+			<PackageName>apache</PackageName>
 		</Package>
 	</ExternalDependencies>
 </PhoronixTestSuite>

pts-core/external-test-dependencies/xml/fedora-packages.xml

@@ -169,6 +169,10 @@
 			<GenericName>curl</GenericName>
 			<PackageName>libcurl curl</PackageName>
 		</Package>
+		<Package>
+			<GenericName>smartmontools</GenericName>
+			<PackageName>smartmontools</PackageName>
+		</Package>
 		<Package>
 			<GenericName>fftw3-development</GenericName>
 			<PackageName>fftw3-devel</PackageName>
@@ -236,7 +240,7 @@
 		</Package>
 		<Package>
 			<GenericName>superlu</GenericName>
-			<PackageName>superlu libsuperlu3</PackageName>
+			<PackageName>superlu-devel</PackageName>
 		</Package>
 		<Package>
 			<GenericName>suitesparse</GenericName>
@@ -248,11 +252,39 @@
 		</Package>
 		<Package>
 			<GenericName>opencl</GenericName>
-			<PackageName>opencl-headers</PackageName>
+			<PackageName>opencl-headers pocl</PackageName>
 		</Package>
 		<Package>
 			<GenericName>attr</GenericName>
 			<PackageName>attr</PackageName>
 		</Package>
+                <Package>
+			<GenericName>httpd</GenericName>
+			<PackageName>httpd</PackageName>
+		</Package>
+                <Package>
+			<GenericName>golang</GenericName>
+			<PackageName>golang</PackageName>
+		</Package>
+                <Package>
+			<GenericName>redis-server</GenericName>
+			<PackageName>redis</PackageName>
+		</Package>
+                <Package>
+			<GenericName>opencv</GenericName>
+			<PackageName>opencv-devel</PackageName>
+		</Package>
+		<Package>
+                        <GenericName>perl-digest-md5</GenericName>
+                        <PackageName>perl-Digest-MD5</PackageName>
+                </Package>
+		<Package>
+			<GenericName>python-scipy</GenericName>
+			<PackageName>scipy</PackageName>
+		</Package>
+		<Package>
+			<GenericName>python-sklearn</GenericName>
+			<PackageName>python-scikit-learn</PackageName>
+		</Package>
 	</ExternalDependencies>
 </PhoronixTestSuite>

pts-core/external-test-dependencies/xml/freebsd-packages.xml

@@ -208,5 +208,9 @@
 			<GenericName>superlu</GenericName>
 			<PackageName>math/superlu</PackageName>
 		</Package>
+                <Package>
+			<GenericName>golang</GenericName>
+			<PackageName>lang/go</PackageName>
+		</Package>
 	</ExternalDependencies>
 </PhoronixTestSuite>

pts-core/external-test-dependencies/xml/generic-packages.xml

@@ -133,6 +133,12 @@
 			<PossibleNames>gfortran, gcc-fortran</PossibleNames>
 			<FileCheck>gfortran</FileCheck>
 		</Package>
+		<Package>
+			<GenericName>smartmontools</GenericName>
+			<Title>SMART Monitoring Tools</Title>
+			<PossibleNames>smartmontools</PossibleNames>
+			<FileCheck>smartctl</FileCheck>
+		</Package>
 		<Package>
 			<GenericName>glew</GenericName>
 			<Title>OpenGL Extension Wrangler</Title>
@@ -263,7 +269,7 @@
 			<GenericName>blas-development</GenericName>
 			<Title>Basic Linear Algebra Sub-Routine Library</Title>
 			<PossibleNames>libblas-dev, libblas-devel, blas-devel, blas</PossibleNames>
-			<FileCheck>cblas.h</FileCheck>
+			<FileCheck>libblas.so</FileCheck>
 		</Package>
 		<Package>
 			<GenericName>lapack-development</GenericName>
@@ -377,8 +383,8 @@
 		<Package>
 			<GenericName>superlu</GenericName>
 			<Title>SuperLU</Title>
-			<PossibleNames>superlu, libsuperlu3-dev</PossibleNames>
-			<FileCheck>superlu/slu_util.h</FileCheck>
+			<PossibleNames>superlu, libsuperlu3-dev, SuperLU-devel</PossibleNames>
+			<FileCheck>superlu/slu_util.h OR SuperLU/slu_util.h, libsuperlu.so</FileCheck>
 		</Package>
 		<Package>
 			<GenericName>suitesparse</GenericName>
@@ -402,7 +408,49 @@
 			<GenericName>attr</GenericName>
 			<Title>Attr</Title>
 			<PossibleNames>attr, libattr1-dev</PossibleNames>
-			<FileCheck>attr/xattr.h</FileCheck>
+			<FileCheck>attr/xattr.h OR sys/xattr.h</FileCheck>
+		</Package>
+		<Package>
+                        <GenericName>httpd</GenericName>
+                        <Title>httpd</Title>
+                        <PossibleNames>httpd, apache2</PossibleNames>
+                        <FileCheck>/usr/sbin/apachectl</FileCheck>
+                </Package>
+		<Package>
+			<GenericName>golang</GenericName>
+			<Title>Go Language</Title>
+			<PossibleNames>golang, go-doc</PossibleNames>
+			<FileCheck>/usr/bin/go</FileCheck>
+		</Package>
+		<Package>
+			<GenericName>redis-server</GenericName>
+			<Title>Redis</Title>
+			<PossibleNames>redis, redis-server</PossibleNames>
+			<FileCheck>/usr/bin/redis-server</FileCheck>
+		</Package>
+		<Package>
+			<GenericName>opencv</GenericName>
+			<Title>OpenCV</Title>
+			<PossibleNames>opencv</PossibleNames>
+			<FileCheck>opencv/cv.h OR opencv2/core.hpp</FileCheck>
+		</Package>
+		<Package>
+                        <GenericName>perl-digest-md5</GenericName>
+                        <Title>Perl interface to the MD5 Algorithm</Title>
+                        <PossibleNames>perl-Digest-MD5, perl-Digest-Perl-MD5, libdigest-md5</PossibleNames>
+                        <FileCheck>Digest/MD5.pm OR /usr/share/doc/perl-Digest-MD5 OR /usr/share/perl5/Digest/</FileCheck>
+                </Package>
+		<Package>
+			<GenericName>python-scipy</GenericName>
+			<Title>Python Scipy</Title>
+			<PossibleNames>python-scipy</PossibleNames>
+			<FileCheck>/usr/lib/python2.7/dist-packages/scipy</FileCheck>
+		</Package>
+		<Package>
+			<GenericName>python-sklearn</GenericName>
+			<Title>Python Sklearn</Title>
+			<PossibleNames>python-sklearn</PossibleNames>
+			<FileCheck>/usr/lib/python2.7/dist-packages/scikit_learn-0.17.egg-info</FileCheck>
 		</Package>
 	</ExternalDependencies>
 </PhoronixTestSuite>

pts-core/external-test-dependencies/xml/gentoo-packages.xml

@@ -162,6 +162,10 @@
 			<GenericName>lapack-development</GenericName>
 			<PackageName>virtual/lapack</PackageName>
 		</Package>
+		<Package>
+			<GenericName>smartmontools</GenericName>
+			<PackageName>sys-apps/smartmontools</PackageName>
+		</Package>
 		<Package>
 			<GenericName>cmake</GenericName>
 			<PackageName>dev-util/cmake</PackageName>
@@ -244,5 +248,33 @@
 			<GenericName>attr</GenericName>
 			<PackageName>sys-apps/attr</PackageName>
 		</Package>
+		<Package>
+			<GenericName>httpd</GenericName>
+			<PackageName>www-servers/apache</PackageName>
+		</Package>
+                <Package>
+			<GenericName>golang</GenericName>
+			<PackageName>dev-lang/go</PackageName>
+		</Package>
+                <Package>
+			<GenericName>redis-server</GenericName>
+			<PackageName>dev-db/redis</PackageName>
+		</Package>
+                <Package>
+			<GenericName>opencv</GenericName>
+			<PackageName>media-libs/opencv</PackageName>
+		</Package>
+		<Package>
+                        <GenericName>perl-digest-md5</GenericName>
+                        <PackageName>perl-core/Digest-MD5</PackageName>
+                </Package>
+		<Package>
+			<GenericName>python-scipy</GenericName>
+			<PackageName>sci-libs/scipy</PackageName>
+		</Package>
+		<Package>
+			<GenericName>python-sklearn</GenericName>
+			<PackageName>sci-libs/scikits_learn</PackageName>
+		</Package>
 	</ExternalDependencies>
 </PhoronixTestSuite>

pts-core/external-test-dependencies/xml/mandrivalinux-packages.xml

@@ -15,6 +15,10 @@
 			<GenericName>sdl-development</GenericName>
 			<PackageName>libSDL1.2_0 libSDL_gfx13 libSDL_image1.2_0 libSDL_net1.2_0 libSDL_ttf2.0_0</PackageName>
 		</Package>
+		<Package>
+			<GenericName>smartmontools</GenericName>
+			<PackageName>smartmontools</PackageName>
+		</Package>
 		<Package>
 			<GenericName>cairo-development</GenericName>
 			<PackageName>cairo-devel</PackageName>
@@ -231,5 +235,21 @@
 			<GenericName>tinyxml</GenericName>
 			<PackageName>tinyxml-devel</PackageName>
 		</Package>
+                <Package>
+			<GenericName>golang</GenericName>
+			<PackageName>golang</PackageName>
+		</Package>
+                <Package>
+			<GenericName>redis-server</GenericName>
+			<PackageName>redis</PackageName>
+		</Package>
+                <Package>
+			<GenericName>opencv</GenericName>
+			<PackageName>opencv-devel</PackageName>
+		</Package>
+		<Package>
+                        <GenericName>perl-digest-md5</GenericName>
+                        <PackageName>perl-Digest-MD5</PackageName>
+                </Package>
 	</ExternalDependencies>
 </PhoronixTestSuite>