Summary
Description: Unnamed repository; edit this file to name it for gitweb.
Last Change: Wed 2/3/10 13:04
Recent Commits
>
--git a/pts-core/functions/pts-functions-install.php b/pts-core/functions/pts-functions-install.php
index 83ef83f..d118d0d 100644
--- a/pts-core/functions/pts-functions-install.php
+++ b/pts-core/functions/pts-functions-install.php
@@ -141,8 +141,10 @@ function pts_install_packages_on_distribution_process($install_objects)
$install_objects = implode(" ", $install_objects);
$distribution = strtolower(os_vendor());
- if(is_file(MISC_LOCATION . "distro-scripts/ && sh install-" . $distribution . "-packages.sh") || is_link(MISC_LOCATION . "distro-scripts/ && sh install-" . $distribution . "-packages.sh"))
+ if(is_file(MISC_LOCATION . "distro-scripts/install-" . $distribution . "-packages.sh") || is_link(MISC_LOCATION . "distro-scripts/install-" . $distribution . "-packages.sh"))
echo pts_exec("cd " . MISC_LOCATION . "distro-scripts/ && sh install-" . $distribution . "-packages.sh $install_objects");
+ else
+ echo "Distribution install script not found!";
}
}
function pts_install_external_dependencies_list($Benchmark, &$INSTALL_OBJ)
diff --git a/pts-core/pts-run-cmd.php b/pts-core/pts-run-cmd.php
index 1c78f57..33b53e9 100644
--- a/pts-core/pts-run-cmd.php
+++ b/pts-core/pts-run-cmd.php
@@ -79,15 +79,15 @@ switch($COMMAND)
if($ARG_1 == "phoronix-test-suite" || $ARG_1 == "pts" || $ARG_1 == "trondheim-pts")
{
- $pts_dependencies = array();
+ $pts_dependencies = array("php-gd", "php-extras", "build-utilities");
$packages_to_install = array();
$continue_install = pts_package_generic_to_distro_name($packages_to_install, $pts_dependencies);
if($continue_install)
pts_install_packages_on_distribution_process($packages_to_install);
}
-
- pts_install_package_on_distribution($ARG_1);
+ else
+ pts_install_package_on_distribution($ARG_1);
break;
case "LIST_TESTS":
echo "\n=================================\n";
diff --git a/pts/misc-files/distro-xml/ubuntu-packages.xml b/pts/misc-files/distro-xml/ubuntu-packages.xml
index 5c69f01..6520f51 100644
--- a/pts/misc-files/distro-xml/ubuntu-packages.xml
+++ b/pts/misc-files/distro-xml/ubuntu-packages.xml
@@ -25,5 +25,15 @@
<PackageName>libpng12-dev</PackageName>
<FileCheck>/usr/include/libpng12/png.h</FileCheck>
</Package>
+ <Package>
+ <GenericName>php-gd</GenericName>
+ <PackageName>php5-gd</PackageName>
+ <FileCheck>/usr/share/doc/php5-gd</FileCheck>
+ </Package>
+ <Package>
+ <GenericName>build-utilities</GenericName>
+ <PackageName>build-essential</PackageName>
+ <FileCheck>/usr/share/build-essential</FileCheck>
+ </Package>
</ExternalDependencies>
</PhoronixTestSuite>
<
Copyright © 2010 by Phoronix Media