Summary
Description: Unnamed repository; edit this file to name it for gitweb.
Last Change: Mon 8/30/10 20:43
Recent Commits
>
--git a/phoronix-test-suite b/phoronix-test-suite
index f347ba6..4830f11 100755
--- a/phoronix-test-suite
+++ b/phoronix-test-suite
@@ -24,6 +24,9 @@ case "${task}" in
"install")
php pts-core/pts-run-cmd.php INSTALL_BENCHMARK $2
;;
+"install-dependencies")
+ php pts-core/pts-run-cmd.php INSTALL_EXTERNAL_DEPENDENCIES $2
+ ;;
"run")
php pts-core/pts-run-benchmark.php $2
;;
@@ -62,6 +65,7 @@ case "${task}" in
echo "=================================\n"
# echo "gui: Launch The Phoronix Test Suite GUI"
echo "install <suite OR benchmark>: Install or Update The Specified Benchmark(s)"
+ echo "install-dependencies <suite OR benchmark>: Install The External (Distribution) Dependencies For Specified Benchmark(s)"
echo "run <suite OR benchmark>: Run The Specified Benchmark/Suite"
echo "benchmark <suite OR benchmark OR saved file>: Same as manually running install and then run"
echo "merge-results <Saved File 1 OR Global ID> <Saved File 2 OR Global ID> <Save To>: Merge two saved result sets"
diff --git a/pts-core/functions/pts-functions-install.php b/pts-core/functions/pts-functions-install.php
index b00f42b..50c896d 100644
--- a/pts-core/functions/pts-functions-install.php
+++ b/pts-core/functions/pts-functions-install.php
@@ -114,7 +114,7 @@ function pts_install_external_dependencies($Benchmark, &$INSTALL_OBJ)
if($dep_match_count == 0)
{
- echo "No packages found for your distribution";
+ echo "No packages found for your distribution (" . os_vendor() . ").";
}
}
diff --git a/pts-core/pts-run-cmd.php b/pts-core/pts-run-cmd.php
index c0365d8..d377de2 100644
--- a/pts-core/pts-run-cmd.php
+++ b/pts-core/pts-run-cmd.php
@@ -60,6 +60,26 @@ switch($COMMAND)
$install_objects = "";
pts_recurse_install_benchmark($ARG_1, $install_objects);
break;
+ case "INSTALL_EXTERNAL_DEPENDENCIES":
+ if(empty($ARG_1))
+ {
+ echo "\nThe benchmark or suite name to install external dependencies for must be supplied.\n";
+ exit;
+ }
+
+ require("pts-core/functions/pts-functions-install.php");
+
+ $ARG_1 = strtolower($ARG_1);
+
+ $install_objects = array();
+ pts_recurse_install_benchmark($ARG_1, $install_objects);
+
+ if(!empty($install_objects))
+ {
+ $install_objects = implode(" ", $install_objects);
+ echo pts_exec("cd " . MISC_LOCATION . "distro-scripts/ && sh install-" . os_vendor() . "-packages.sh $install_objects\n");
+ }
+ break;
case "REMOTE_COMPARISON":
echo "Now Use merge-results for remote comparison with integrated Global ID support.";
echo "merge-results <Saved File 1 OR Global ID> <Saved File 2 OR Global ID> <Save To>: Merge two saved result sets";
<
Copyright © 2010 by Phoronix Media