Make tests run when installed via PEAR

pear run-tests -p console_getopt

Author: cweiske

package.xml

@@ -44,7 +44,15 @@ short and long options.</description>
 
  <contents>
   <dir name="/">
-   <file name="Console/Getopt.php" role="php" />
+   <dir name="Console">
+    <file name="Getopt.php" role="php" />
+   </dir>
+   <dir name="tests">
+    <file role="test" name="001-getopt.phpt" />
+    <file role="test" name="bug10557.phpt" />
+    <file role="test" name="bug11068.phpt" />
+    <file role="test" name="bug13140.phpt" />
+   </dir>
   </dir>
  </contents>
 

tests/001-getopt.phpt

@@ -2,7 +2,7 @@
 Console_Getopt
 --FILE--
 <?php
-require_once __DIR__ .  '/../Console/Getopt.php';
+require_once 'Console/Getopt.php';
 PEAR::setErrorHandling(PEAR_ERROR_PRINT, "%s\n\n");
 
 function test($argstr, $optstr) {

tests/bug10557.phpt

@@ -5,7 +5,7 @@ Console_Getopt [bug 10557]
 <?php
 $_SERVER['argv'] =
 $argv = array('hi', '[email protected]', '--to', '--mailpack', '--debug');
-require_once __DIR__ . '/../Console/Getopt.php';
+require_once 'Console/Getopt.php';
 $ret = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), 'f:t:',
 array('from=','to=','mailpack=','direction=','verbose','debug'));
 if(PEAR::isError($ret))

tests/bug11068.phpt

@@ -5,7 +5,7 @@ Console_Getopt [bug 11068]
 <?php
 $_SERVER['argv'] =
 $argv = array('hi', '[email protected]', '--to', 'hi', '-');
-require_once __DIR__ . '/../Console/Getopt.php';
+require_once 'Console/Getopt.php';
 $ret = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), 'f:t:',
 array('from=','to=','mailpack=','direction=','verbose','debug'));
 if(PEAR::isError($ret))

tests/bug13140.phpt

@@ -6,7 +6,7 @@ Console_Getopt [bug 13140]
 $_SERVER['argv'] = $argv =
     array('--bob', '--foo' , '-bar', '--test', '-rq', 'thisshouldbehere');
 
-require_once __DIR__ . '/../Console/Getopt.php';
+require_once 'Console/Getopt.php';
 $cg = new Console_GetOpt();
 
 print_r($cg->getopt2($cg->readPHPArgv(), 't', array('test'), true));