diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-07-09 12:43:15 -0400 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-08-03 11:49:19 -0400 |
| commit | e0801a19d4144155065facd16ada486d95e9f397 (patch) | |
| tree | 89e468ce147ba2d10178ae1d8c989bda3d81122b | |
| parent | 9817247d4ebdab589d6b7fdac14db8d31f6aa80c (diff) | |
| download | phoronix-test-suite-upstream-e0801a19d4144155065facd16ada486d95e9f397.tar.gz phoronix-test-suite-upstream-e0801a19d4144155065facd16ada486d95e9f397.tar.xz phoronix-test-suite-upstream-e0801a19d4144155065facd16ada486d95e9f397.zip | |
Install linux-32bit-libraries and php-extras by default when running PTS
External Dependencies for the first time, plus a few other changes
bundled in this commit.
| -rw-r--r-- | PTS-12-CHANGE-LOG | 1 | ||||
| -rwxr-xr-x | phoronix-test-suite | 2 | ||||
| -rw-r--r-- | pts-core/functions/pts-functions-install.php | 12 | ||||
| -rw-r--r-- | pts-core/functions/pts-functions.php | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/PTS-12-CHANGE-LOG b/PTS-12-CHANGE-LOG index e6e4a10..1d3a464 100644 --- a/PTS-12-CHANGE-LOG +++ b/PTS-12-CHANGE-LOG @@ -42,6 +42,7 @@ - pts: Add ProjectURL tag to available test profiles - pts: Add PTS External Dependencies support for OpenSolaris using IPS +- pts: Add linux-32bit-libraries generic package to PTS External Dependencies - pts-run-benchmark: General code cleanups diff --git a/phoronix-test-suite b/phoronix-test-suite index 745c904..b70aead 100755 --- a/phoronix-test-suite +++ b/phoronix-test-suite @@ -123,7 +123,7 @@ case "$1" in "list-installed-tests") $PHP_BIN pts-core/pts-run-cmd.php LIST_INSTALLED_TESTS ;; -"list-results" | "list-saved-results" | "list-results") +"list-results" | "list-saved-results" | "list-test-results") $PHP_BIN pts-core/pts-run-cmd.php LIST_SAVED_RESULTS ;; "show-result" | "show-results" | "view-result" | "view-results") diff --git a/pts-core/functions/pts-functions-install.php b/pts-core/functions/pts-functions-install.php index 26f2c98..193ef7a 100644 --- a/pts-core/functions/pts-functions-install.php +++ b/pts-core/functions/pts-functions-install.php @@ -413,11 +413,21 @@ function pts_install_external_dependencies_list($identifier, &$INSTALL_OBJ) if(empty($dependencies)) return; - $dependencies = explode(',', $dependencies); + $dependencies = explode(",", $dependencies); for($i = 0; $i < count($dependencies); $i++) $dependencies[$i] = trim($dependencies[$i]); + if(!defined("PTS_EXDEP_FIRST_RUN")) + { + array_push($dependencies, "php-extras"); + + if(kernel_arch() == "x86_64") + array_push($dependencies, "linux-32bit-libraries"); + + define("PTS_EXDEP_FIRST_RUN", 1); + } + $vendor = pts_vendor_identifier(); if(!pts_package_generic_to_distro_name($INSTALL_OBJ, $dependencies)) diff --git a/pts-core/functions/pts-functions.php b/pts-core/functions/pts-functions.php index 4b1dd10..052a6b4 100644 --- a/pts-core/functions/pts-functions.php +++ b/pts-core/functions/pts-functions.php @@ -298,7 +298,7 @@ function pts_process_register($process) function pts_process_remove($process) { if(is_file(TEST_ENV_DIR . ".processes/" . $process . ".p")) - return unlink(TEST_ENV_DIR . ".processes/" . $process . ".p"); + return @unlink(TEST_ENV_DIR . ".processes/" . $process . ".p"); } function pts_process_active($process) { |