diff options
author | Greg Beaver <cellog@php.net> | 2004-06-01 14:29:59 +0000 |
---|---|---|
committer | Greg Beaver <cellog@php.net> | 2004-06-01 14:29:59 +0000 |
commit | 27a4b575e84cb511690077509ff64a6efdf0511e (patch) | |
tree | ab4ff1c6cd335290f7b8d9ba21fcea1d8dc0f089 /pear/tests | |
parent | cb0b01f7c2f3fe848dba65f3ff81059631d849d4 (diff) | |
download | php-git-27a4b575e84cb511690077509ff64a6efdf0511e.tar.gz |
test files for PEAR are now installable!
Diffstat (limited to 'pear/tests')
-rw-r--r-- | pear/tests/package-PEARtests.xml | 4 | ||||
-rw-r--r-- | pear/tests/pear_error.phpt | 2 | ||||
-rw-r--r-- | pear/tests/pear_error2.phpt | 2 | ||||
-rw-r--r-- | pear/tests/pear_error3.phpt | 2 | ||||
-rw-r--r-- | pear/tests/pear_error4.phpt | 2 | ||||
-rw-r--r-- | pear/tests/pear_installer1.phpt | 2 | ||||
-rw-r--r-- | pear/tests/pear_installer_install_channels.phpt | 1 | ||||
-rw-r--r-- | pear/tests/pear_registry.phpt | 2 | ||||
-rw-r--r-- | pear/tests/pear_registry_1.1.phpt | 2 |
9 files changed, 12 insertions, 7 deletions
diff --git a/pear/tests/package-PEARtests.xml b/pear/tests/package-PEARtests.xml index b96fbe0dff..9972ecf021 100644 --- a/pear/tests/package-PEARtests.xml +++ b/pear/tests/package-PEARtests.xml @@ -67,9 +67,12 @@ <file role="test" name="TestUnit.php"/> </dir> <!-- PEAR_ErrorStack --> <dir name="test-pkg6"> + <file role="test" name="conflictpackage2.xml"/> <file role="test" name="conflictpackage.xml"/> <file role="test" name="invalidtgz.tgz"/> <file role="test" name="nopackagexml.tgz"/> + <file role="test" name="package2.xml"/> + <file role="test" name="package2_invalid.xml"/> <file role="test" name="package.xml"/> <file role="test" name="pkg6-1.1.tgz"/> <file role="test" name="pkg6-2.0b1.tgz"/> @@ -122,6 +125,7 @@ <file role="test" name="pear_installer_installFile_channels.phpt"/> <file role="test" name="pear_installer_install_channels.phpt"/> <file role="test" name="pear_packager.phpt"/> + <file role="test" name="pear_registry_inc.php.inc"/> <file role="test" name="pear_registry.phpt"/> <file role="test" name="pear_registry_1.1.phpt"/> <file role="test" name="pear_system.phpt"/> diff --git a/pear/tests/pear_error.phpt b/pear/tests/pear_error.phpt index 5b3efaec38..2a77cf497d 100644 --- a/pear/tests/pear_error.phpt +++ b/pear/tests/pear_error.phpt @@ -13,7 +13,7 @@ if (!getenv('PHP_PEAR_RUNTESTS')) { // Parts tested: - PEAR_Error class // - PEAR::isError static method -include dirname(__FILE__)."/../PEAR.php"; +include_once "PEAR.php"; function test_error_handler($errno, $errmsg, $file, $line, $vars) { $errortype = array ( diff --git a/pear/tests/pear_error2.phpt b/pear/tests/pear_error2.phpt index aca029b47d..9dbfa3b22c 100644 --- a/pear/tests/pear_error2.phpt +++ b/pear/tests/pear_error2.phpt @@ -14,7 +14,7 @@ if (!getenv('PHP_PEAR_RUNTESTS')) { // - PEAR::isError static method // testing PEAR_Error -include dirname(__FILE__)."/../PEAR.php"; +include_once "PEAR.php"; error_reporting(E_ALL); diff --git a/pear/tests/pear_error3.phpt b/pear/tests/pear_error3.phpt index 63378a4450..2e5ce8d2a2 100644 --- a/pear/tests/pear_error3.phpt +++ b/pear/tests/pear_error3.phpt @@ -14,7 +14,7 @@ if (!getenv('PHP_PEAR_RUNTESTS')) { // - PEAR::setErrorHandling // - PEAR::raiseError method -include dirname(__FILE__)."/../PEAR.php"; +include_once "PEAR.php"; error_reporting(E_ALL); diff --git a/pear/tests/pear_error4.phpt b/pear/tests/pear_error4.phpt index b34dbcee12..0d6754c88b 100644 --- a/pear/tests/pear_error4.phpt +++ b/pear/tests/pear_error4.phpt @@ -14,7 +14,7 @@ if (!getenv('PHP_PEAR_RUNTESTS')) { // - PEAR::expectError // - PEAR::popExpect -include dirname(__FILE__)."/../PEAR.php"; +include_once "PEAR.php"; error_reporting(E_ALL); diff --git a/pear/tests/pear_installer1.phpt b/pear/tests/pear_installer1.phpt index f754d4d9c9..9daf2ecf07 100644 --- a/pear/tests/pear_installer1.phpt +++ b/pear/tests/pear_installer1.phpt @@ -19,7 +19,7 @@ if (!is_dir($temp_path)) { touch($temp_path . DIRECTORY_SEPARATOR . 'user.conf'); // no UI is needed for these tests $ui = false; -$config = new PEAR_Config; +$config = new PEAR_Config($temp_path . DIRECTORY_SEPARATOR . 'user.conf'); $config->set('php_dir', dirname(__FILE__) . DIRECTORY_SEPARATOR . 'testinstallertemp'); $reg = &new PEAR_Registry($config->get('php_dir')); $chan = new PEAR_ChannelFile; diff --git a/pear/tests/pear_installer_install_channels.phpt b/pear/tests/pear_installer_install_channels.phpt index ab1811db33..d4c3418d0d 100644 --- a/pear/tests/pear_installer_install_channels.phpt +++ b/pear/tests/pear_installer_install_channels.phpt @@ -14,6 +14,7 @@ if (!is_dir($temp_path)) { } if (!is_dir($temp_path . DIRECTORY_SEPARATOR . 'php')) { mkdir($temp_path . DIRECTORY_SEPARATOR . 'php'); + mkdir($temp_path . DIRECTORY_SEPARATOR . 'php' . DIRECTORY_SEPARATOR . 'frob'); } if (!is_dir($temp_path . DIRECTORY_SEPARATOR . 'data')) { mkdir($temp_path . DIRECTORY_SEPARATOR . 'data'); diff --git a/pear/tests/pear_registry.phpt b/pear/tests/pear_registry.phpt index e3083cbb6a..26cafa3035 100644 --- a/pear/tests/pear_registry.phpt +++ b/pear/tests/pear_registry.phpt @@ -15,7 +15,7 @@ if (file_exists($statedir)) { <?php error_reporting(E_ALL); -include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'pear_registry_inc.php'; +include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'pear_registry_inc.php.inc'; include_once "PEAR/Registry.php"; PEAR::setErrorHandling(PEAR_ERROR_DIE, "%s\n"); $statedir = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'registry_tester'; diff --git a/pear/tests/pear_registry_1.1.phpt b/pear/tests/pear_registry_1.1.phpt index 8c81c0ee56..5af8636072 100644 --- a/pear/tests/pear_registry_1.1.phpt +++ b/pear/tests/pear_registry_1.1.phpt @@ -23,7 +23,7 @@ if (PEAR_Registry::apiVersion() != '1.1') { --FILE-- <?php error_reporting(E_ALL); -include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'pear_registry_inc.php'; +include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'pear_registry_inc.php.inc'; include_once "PEAR/Registry.php"; PEAR::setErrorHandling(PEAR_ERROR_DIE, "%s\n"); $statedir = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'registry_tester'; |