Summary
Description: Phoronix Test Suite open-source benchmarking development
Last Change: Fri 5/17/13 22:52
Recent Commits
>
--git a/pts-core/library/pts-includes-install.php b/pts-core/library/pts-includes-install.php
index 6dc514d..588e994 100644
--- a/pts-core/library/pts-includes-install.php
+++ b/pts-core/library/pts-includes-install.php
@@ -23,7 +23,7 @@
require_once(PTS_LIBRARY_PATH . "pts-includes-install_dependencies.php");
-function pts_start_install($to_install)
+function pts_start_install($to_install, &$display_mode)
{
$to_install = pts_to_array($to_install);
@@ -74,7 +74,7 @@ function pts_start_install($to_install)
foreach($tests as $test)
{
- pts_install_test($test);
+ pts_install_test($test, $display_mode);
}
pts_module_process("__post_install_process", $tests);
@@ -376,7 +376,7 @@ function pts_setup_install_test_directory($identifier, $remove_old_files = false
pts_symlink($xauth_file, TEST_ENV_DIR . $identifier . "/.Xauthority");
}
}
-function pts_install_test($identifier)
+function pts_install_test($identifier, &$display_mode)
{
if(!pts_is_test($identifier))
{
diff --git a/pts-core/library/pts-includes-install_dependencies.php b/pts-core/library/pts-includes-install_dependencies.php
index 91731d3..8faf5c5 100644
--- a/pts-core/library/pts-includes-install_dependencies.php
+++ b/pts-core/library/pts-includes-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($identifiers)
+function pts_install_package_on_distribution($identifiers, &$display_mode)
{
// PTS External Dependencies install on distribution
if(!pts_is_assignment("SILENCE_MESSAGES"))
@@ -47,7 +47,7 @@ function pts_install_package_on_distribution($identifiers)
return count($install_objects) == 0;
}
- pts_install_packages_on_distribution_process($install_objects);
+ pts_install_packages_on_distribution_process($install_objects, $display_mode);
return true;
}
@@ -223,7 +223,7 @@ function pts_external_dependencies_missing()
return $missing_dependencies;
}
-function pts_install_packages_on_distribution_process($install_objects)
+function pts_install_packages_on_distribution_process($install_objects, &$display_mode)
{
// Do the actual installing process of packages using the distribution's package management system
if(!empty($install_objects))
@@ -237,6 +237,7 @@ function pts_install_packages_on_distribution_process($install_objects)
if(is_file(SCRIPT_DISTRO_DIR . "install-" . $distribution . "-packages.sh"))
{
+ // TODO: hook into $display_mode here if it's desired
echo "\nThe following dependencies will be installed: \n";
foreach(explode(" ", $install_objects) as $obj)
diff --git a/pts-core/options/install_test.php b/pts-core/options/install_test.php
index 309be06..d93d38f 100644
--- a/pts-core/options/install_test.php
+++ b/pts-core/options/install_test.php
@@ -69,15 +69,17 @@ class install_test implements pts_option_interface
echo "\n";
+ $display_mode = pts_get_display_mode_object();
+
// Any external dependencies?
- if(!pts_install_package_on_distribution($items_to_install))
+ if(!pts_install_package_on_distribution($items_to_install, $display_mode))
{
echo "\nInstallation of needed test dependencies failed.\n\n";
return false;
}
// Install tests
- pts_start_install($items_to_install);
+ pts_start_install($items_to_install, $display_mode);
}
}
}
<
Copyright © 2013 by Phoronix Media