MFH

diff --git a/pear/tests/pear1.phpt b/pear/tests/pear1.phpt
index 2961ff7284a4c3e25c2efc900281fd84f71db0f7..400a97ebd770f26b08f4c0ac5f049e08365ae083 100644 (file)
--- a/pear/tests/pear1.phpt
+++ b/pear/tests/pear1.phpt
@@ -1,7 +1,11 @@
 --TEST--
 PEAR constructor/destructor test
 --SKIPIF--
-skip
+<?php
+if (!getenv('PHP_PEAR_RUNTESTS')) {
+    echo 'skip';
+}
+?>
 --FILE--
 <?php
 

diff --git a/pear/tests/pear_config.phpt b/pear/tests/pear_config.phpt
index 7e125ac8550e6b47f75df7ce6619debdd12add0b..5bc00165b801195b7ab04c72e1303e7a932f87e5 100644 (file)
--- a/pear/tests/pear_config.phpt
+++ b/pear/tests/pear_config.phpt
@@ -1,13 +1,17 @@
 --TEST--
 PEAR_Config
 --SKIPIF--
-skip
+<?php
+if (!getenv('PHP_PEAR_RUNTESTS')) {
+    echo 'skip';
+}
+?>
 --FILE--
 <?php
 
 error_reporting(E_ALL);
 chdir(dirname(__FILE__));
-include "../PEAR/Config.php";
+include "PEAR/Config.php";
 copy("system.input", "system.conf");
 copy("user.input", "user.conf");
 copy("user2.input", "user2.conf");
@@ -222,7 +226,7 @@ string(9) "directory"
 master_server: name of the main PEAR server
 
 #9 testing: getKeys
-bin_dir cache_dir cache_ttl data_dir doc_dir ext_dir http_proxy master_server password php_dir preferred_state sig_bin sig_keydir sig_type test_dir umask username verbose
+bin_dir cache_dir cache_ttl data_dir doc_dir ext_dir http_proxy master_server password php_bin php_dir preferred_state sig_bin sig_keydir sig_keyid sig_type test_dir umask username verbose
 
 #10 testing: definedBy
 string(7) "default"
@@ -247,10 +251,12 @@ ext_dir: File Locations
 http_proxy: Internet Access
 master_server: Internet Access
 password: Maintainers
+php_bin: File Locations (Advanced)
 php_dir: File Locations
 preferred_state: Advanced
 sig_bin: Maintainers
 sig_keydir: Maintainers
+sig_keyid: Maintainers
 sig_type: Maintainers
 test_dir: File Locations (Advanced)
 umask: Advanced
@@ -263,9 +269,9 @@ Advanced, File Locations, File Locations (Advanced), Internet Access, Maintainer
 #14 testing: getGroupKeys
 Advanced: cache_ttl, preferred_state, umask, verbose
 File Locations: bin_dir, doc_dir, ext_dir, php_dir
-File Locations (Advanced): cache_dir, data_dir, test_dir
+File Locations (Advanced): cache_dir, data_dir, php_bin, test_dir
 Internet Access: http_proxy, master_server
-Maintainers: password, sig_bin, sig_keydir, sig_type, username
+Maintainers: password, sig_bin, sig_keydir, sig_keyid, sig_type, username
 
 #15 testing: getPrompt
 bin_dir: PEAR executables directory
@@ -277,13 +283,15 @@ ext_dir: PHP extension directory
 http_proxy: HTTP Proxy Server Address
 master_server: PEAR server
 password: PEAR password (for maintainers)
+php_bin: PHP CLI/CGI binary
 php_dir: PEAR directory
 preferred_state: Preferred Package State
 sig_bin: Signature Handling Program
 sig_keydir: Signature Key Directory
+sig_keyid: Signature Key Id
 sig_type: Package Signature Type
 test_dir: PEAR test directory
 umask: Unix file mask
 username: PEAR username (for maintainers)
 verbose: Debug Log Level
-done
+done
\ No newline at end of file

diff --git a/pear/tests/pear_error.phpt b/pear/tests/pear_error.phpt
index 51493633eaf6c25e8a8b3294bb38b0272d751a59..e65cd562cee2cc15b3d5cea201d4f0692813ffcb 100644 (file)
--- a/pear/tests/pear_error.phpt
+++ b/pear/tests/pear_error.phpt
@@ -1,7 +1,11 @@
 --TEST--
 PEAR_Error: basic test
 --SKIPIF--
-skip
+<?php
+if (!getenv('PHP_PEAR_RUNTESTS')) {
+    echo 'skip';
+}
+?>
 --FILE--
 <?php // -*- PHP -*-
 

diff --git a/pear/tests/pear_error2.phpt b/pear/tests/pear_error2.phpt
index 4ae1c4b70153b7edfccb6620d2b810eda65dccb9..17d3208f7c263dd33c26bd8ea0190256a45546c5 100644 (file)
--- a/pear/tests/pear_error2.phpt
+++ b/pear/tests/pear_error2.phpt
@@ -1,7 +1,11 @@
 --TEST--
 PEAR_Error: die mode
 --SKIPIF--
-skip
+<?php
+if (!getenv('PHP_PEAR_RUNTESTS')) {
+    echo 'skip';
+}
+?>
 --FILE--
 <?php // -*- C++ -*-
 

diff --git a/pear/tests/pear_error3.phpt b/pear/tests/pear_error3.phpt
index 4c89ae5a693ff578c0aab712f72013d1eb722d1b..63378a44500258facfb3b9d3514f551e0ca4be46 100644 (file)
--- a/pear/tests/pear_error3.phpt
+++ b/pear/tests/pear_error3.phpt
@@ -1,7 +1,11 @@
 --TEST--
 PEAR_Error: default error handling
 --SKIPIF--
-skip
+<?php
+if (!getenv('PHP_PEAR_RUNTESTS')) {
+    echo 'skip';
+}
+?>
 --FILE--
 <?php // -*- PHP -*-
 

diff --git a/pear/tests/pear_error4.phpt b/pear/tests/pear_error4.phpt
index 57f69359b8dde933a6a629789d1f3053fff5e822..b34dbcee12a572a2e5fd6da55ac43be0257318f2 100644 (file)
--- a/pear/tests/pear_error4.phpt
+++ b/pear/tests/pear_error4.phpt
@@ -1,7 +1,11 @@
 --TEST--
 PEAR_Error: expected errors
 --SKIPIF--
-skip
+<?php
+if (!getenv('PHP_PEAR_RUNTESTS')) {
+    echo 'skip';
+}
+?>
 --FILE--
 <?php // -*- PHP -*-
 

diff --git a/pear/tests/pear_registry.phpt b/pear/tests/pear_registry.phpt
index 0295ed922e4f5be18a3ddcb7575ca1ff687c9e60..ebec1763fde40b97a6f296cdbaa3b7b47d98ab6c 100644 (file)
--- a/pear/tests/pear_registry.phpt
+++ b/pear/tests/pear_registry.phpt
@@ -1,7 +1,11 @@
 --TEST--
 PEAR_Registry
 --SKIPIF--
-skip
+<?php
+if (!getenv('PHP_PEAR_RUNTESTS')) {
+    echo 'skip';
+}
+?>
 --FILE--
 <?php
 
@@ -71,7 +75,9 @@ dumpall($reg);
 $reg->updatePackage("pkg3", array("version" => "3.1b1", "status" => "beta"));
 dumpall($reg);
 
-print_r($reg->checkFilemap(array_merge($files3, $files2)));
+$testing = $reg->checkFilemap(array_merge($files3, $files2));
+$ok = ($testing == array('pkg3-1.php' => 'pkg3', 'pkg3' . DIRECTORY_SEPARATOR . 'pkg3-2.php' => 'pkg3'));
+echo 'filemap OK? ' . ($ok ? "yes\n" : "no\n");
 
 $reg->updatePackage("pkg3", array("filelist" => $files3_new));
 dumpall($reg);
@@ -156,11 +162,7 @@ dumping registry...
 pkg1: version="1.0" filelist=array(pkg1-1.php[role=php],pkg1-2.php[role=php,baseinstalldir=pkg1])
 pkg3: version="3.1b1" filelist=array(pkg3-1.php[role=php],pkg3-2.php[role=php,baseinstalldir=pkg3]) status="beta"
 dump done
-Array
-(
-    [pkg3-1.php] => pkg3
-    [pkg3/pkg3-2.php] => pkg3
-)
+filemap OK? yes
 dumping registry...
 pkg1: version="1.0" filelist=array(pkg1-1.php[role=php],pkg1-2.php[role=php,baseinstalldir=pkg1])
 pkg3: version="3.1b1" filelist=array(pkg3-3.php[role=php,baseinstalldir=pkg3],pkg3-4.php[role=php]) status="beta"

diff --git a/pear/tests/pear_system.phpt b/pear/tests/pear_system.phpt
index 64f3d1143ee453a84e749fb4805089b93a78f1ec..591b3b648409ba572df8800c3b0bbbe013d8f804 100644 (file)
--- a/pear/tests/pear_system.phpt
+++ b/pear/tests/pear_system.phpt
@@ -1,14 +1,21 @@
 --TEST--
 System commands tests
 --SKIPIF--
-skip
+<?php
+if (!getenv('PHP_PEAR_RUNTESTS')) {
+    echo 'skip';
+}
+?>
 --FILE--
 <?php
 error_reporting(E_ALL);
 require_once 'System.php';
 
 $sep = DIRECTORY_SEPARATOR;
-
+$ereg_sep = $sep;
+if (OS_WINDOWS) {
+    $ereg_sep .= $sep;
+}
 /*******************
         mkDir
 ********************/
@@ -17,6 +24,7 @@ System::mkDir('singledir');
 if( !is_dir('singledir') ){
     print "System::mkDir('singledir'); failed\n";
 }
+System::rm('singledir');
 
 // Multiple directory creation
 System::mkDir('dir1 dir2 dir3');
@@ -51,14 +59,15 @@ if (!@is_dir("dir2{$sep}dir21") || !@is_dir("dir6{$sep}dir61{$sep}dir611")) {
 
 // Create a temporal file with "tst" as filename prefix
 $tmpfile = System::mkTemp('tst');
-$tmpenv = System::tmpDir();
-if (!@is_file($tmpfile) || !ereg("^$tmpenv{$sep}tst", $tmpfile)) {
+$tmpenv = str_replace($sep, $ereg_sep, System::tmpDir());
+if (!@is_file($tmpfile) || !ereg("^$tmpenv{$ereg_sep}tst", $tmpfile)) {
     print "System::mkTemp('tst') failed\n";
+    var_dump(is_file($tmpfile), $tmpfile, "^$tmpenv{$ereg_sep}tst", !ereg("^$tmpenv{$ereg_sep}tst", $tmpfile));
 }
 
 // Create a temporal dir in "dir1" with default prefix "tmp"
 $tmpdir  = System::mkTemp('-d -t dir1');
-if (!@is_dir($tmpdir) || !ereg("^dir1{$sep}tmp", $tmpdir)) {
+if (!@is_dir($tmpdir) || !ereg("^dir1{$ereg_sep}tmp", $tmpdir)) {
     print "System::mkTemp('-d -t dir1') failed\n";
 }