cvs: pear /PEAR_PackageUpdate/tests customConfig.phpt defaultConfig.phpt

farell		Wed Apr 30 19:16:01 2008 UTC

  Modified files:              
    /pear/PEAR_PackageUpdate/tests	customConfig.phpt defaultConfig.phpt 
  Log:
  fix test suite to restore system pear config file
  
http://cvs.php.net/viewvc.cgi/pear/PEAR_PackageUpdate/tests/customConfig.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pear/PEAR_PackageUpdate/tests/customConfig.phpt
diff -u pear/PEAR_PackageUpdate/tests/customConfig.phpt:1.1 pear/PEAR_PackageUpdate/tests/customConfig.phpt:1.2
--- pear/PEAR_PackageUpdate/tests/customConfig.phpt:1.1	Mon Apr 28 20:38:13 2008
+++ pear/PEAR_PackageUpdate/tests/customConfig.phpt	Wed Apr 30 19:16:01 2008
@@ -4,28 +4,26 @@
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
 
-require_once 'PEAR/Config.php';
-
-$config =& PEAR_Config::singleton();
-$cfgDir = $config->get('cfg_dir');  // available only since PEAR 1.7.0
-
 $ds         = DIRECTORY_SEPARATOR;
 $dir        = dirname(__FILE__);
 $sysconfdir = $dir . $ds . 'sysconf_dir';
 $peardir    = $dir . $ds . 'pear_dir';
 
+putenv("PHP_PEAR_SYSCONF_DIR=" . $sysconfdir);
+chdir($dir);
+
+// we get PEAR_PackageUpdate class only here due to setting of PEAR_CONFIG_SYSCONFDIR
+include_once 'PEAR/PackageUpdate.php';
+
+$config =& PEAR_Config::singleton();
+$cfgDir = $config->get('cfg_dir');  // available only since PEAR 1.7.0
+
 if (!is_null($cfgDir) && is_dir($cfgDir)) {
     $pearcfgdir = $peardir . $ds . 'cfg';
 } else {
     $pearcfgdir = $sysconfdir;
 }
 
-putenv("PHP_PEAR_SYSCONF_DIR=" . $sysconfdir);
-chdir($dir);
-
-// we get PEAR_PackageUpdate class only here due to setting of PEAR_CONFIG_SYSCONFDIR
-require_once 'PEAR/PackageUpdate.php';
-
 if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
     $system_file = $sysconfdir . $ds . 'pearsys.ini';
     $pref_file   = $pearcfgdir . $ds . 'ppurc.ini';
@@ -121,11 +119,6 @@
 ?>
 --CLEAN--
 <?php
-require_once 'PEAR/Config.php';
-
-$config =& PEAR_Config::singleton();
-$cfgDir = $config->get('cfg_dir');  // available only since PEAR 1.7.0
-
 $ds         = DIRECTORY_SEPARATOR;
 $dir        = dirname(__FILE__);
 $sysconfdir = $dir . $ds . 'sysconf_dir';
http://cvs.php.net/viewvc.cgi/pear/PEAR_PackageUpdate/tests/defaultConfig.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pear/PEAR_PackageUpdate/tests/defaultConfig.phpt
diff -u pear/PEAR_PackageUpdate/tests/defaultConfig.phpt:1.1 pear/PEAR_PackageUpdate/tests/defaultConfig.phpt:1.2
--- pear/PEAR_PackageUpdate/tests/defaultConfig.phpt:1.1	Sun Apr 27 17:58:33 2008
+++ pear/PEAR_PackageUpdate/tests/defaultConfig.phpt	Wed Apr 30 19:16:01 2008
@@ -2,28 +2,26 @@
 PEAR_PackageUpdate using default configuration
 --FILE--
 <?php
-require_once 'PEAR/Config.php';
-
-$config =& PEAR_Config::singleton();
-$cfgDir = $config->get('cfg_dir');  // available only since PEAR 1.7.0
-
 $ds         = DIRECTORY_SEPARATOR;
 $dir        = dirname(__FILE__);
 $sysconfdir = $dir . $ds . 'sysconf_dir';
 $peardir    = $dir . $ds . 'pear_dir';
 
+putenv("PHP_PEAR_SYSCONF_DIR=" . $sysconfdir);
+chdir($dir);
+
+// we get PEAR_PackageUpdate class only here due to setting of PEAR_CONFIG_SYSCONFDIR
+include_once 'PEAR/PackageUpdate.php';
+
+$config =& PEAR_Config::singleton();
+$cfgDir = $config->get('cfg_dir');  // available only since PEAR 1.7.0
+
 if (!is_null($cfgDir) && is_dir($cfgDir)) {
     $pearcfgdir = $peardir . $ds . 'cfg';
 } else {
     $pearcfgdir = $sysconfdir;
 }
 
-putenv("PHP_PEAR_SYSCONF_DIR=" . $sysconfdir);
-chdir($dir);
-
-// we get PEAR_PackageUpdate class only here due to setting of PEAR_CONFIG_SYSCONFDIR
-require_once 'PEAR/PackageUpdate.php';
-
 if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
     $system_file = $sysconfdir . $ds . 'pearsys.ini';
     $pref_file   = $pearcfgdir . $ds . 'ppurc.ini';
@@ -66,11 +64,6 @@
 ?>
 --CLEAN--
 <?php
-require_once 'PEAR/Config.php';
-
-$config =& PEAR_Config::singleton();
-$cfgDir = $config->get('cfg_dir');  // available only since PEAR 1.7.0
-
 $ds         = DIRECTORY_SEPARATOR;
 $dir        = dirname(__FILE__);
 $sysconfdir = $dir . $ds . 'sysconf_dir';