pts-core: Allow multiple tests/suites/identifiers to be passed using the

install (and force-install) option

2 files changed, 30 insertions, 6 deletions

diff --git a/pts-core/functions/pts-functions-install.php b/pts-core/functions/pts-functions-install.php
index 5e96e53..230aa35 100644
--- a/pts-core/functions/pts-functions-install.php
+++ b/pts-core/functions/pts-functions-install.php
@@ -23,15 +23,29 @@
 
 require_once("pts-core/functions/pts-functions-install_dependencies.php");
 
-function pts_start_install($TO_INSTALL)
+function pts_start_install($to_install)
 {
+	if(!is_array($to_install))
+	{
+		$to_install = array($to_install);
+	}
+
 	if(IS_SCTP_MODE)
 	{
-		$tests = array($TO_INSTALL);
+		$tests = array($to_install[0]);
 	}
 	else
 	{
-		$tests = pts_contained_tests($TO_INSTALL, true);
+		$tests = array();
+
+		foreach($to_install as $to_install_test)
+		{
+			foreach(pts_contained_tests($to_install_test, true) as $test)
+			{
+				array_push($tests, $test);
+			}
+		}
+		$tests = array_unique($tests);
 
 		if(count($tests) == 0)
 		{
diff --git a/pts-core/functions/pts-functions-install_dependencies.php b/pts-core/functions/pts-functions-install_dependencies.php
index 2fd7274..6665099 100644
--- a/pts-core/functions/pts-functions-install_dependencies.php
+++ b/pts-core/functions/pts-functions-install_dependencies.php
@@ -21,7 +21,7 @@
 	along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-function pts_install_package_on_distribution($identifier)
+function pts_install_package_on_distribution($identifiers)
 {
 	// PTS External Dependencies install on distribution
 	if(pts_read_assignment("COMMAND") != "benchmark")
@@ -29,9 +29,19 @@ function pts_install_package_on_distribution($identifier)
 		echo "Checking For Needed External Dependencies.\n";
 	}
 
-	$identifier = strtolower($identifier);
 	$install_objects = array();
-	pts_start_install_dependencies($identifier, $install_objects);
+
+	if(!is_array($identifiers))
+	{
+		$identifiers = array($identifiers);
+	}
+
+	foreach($identifiers as $identifier)
+	{
+		pts_start_install_dependencies($identifier, $install_objects);
+	}
+	$install_objects = array_unique($install_objects);
+
 	pts_install_packages_on_distribution_process($install_objects);
 }
 function pts_start_install_dependencies($TO_INSTALL, &$PLACE_LIST)