fix tests
authorMichael Wallner <mike@php.net>
Wed, 2 Sep 2015 15:46:44 +0000 (17:46 +0200)
committerMichael Wallner <mike@php.net>
Wed, 2 Sep 2015 15:46:44 +0000 (17:46 +0200)
tests/autoload.php
tests/src/pharext/CliCommandTest.php
tests/src/pharext/TaskTest.php

index 116defaf6fec1ae047e1d829fd872f60d9123ad4..341def01d18d4ed35efcb36672b08674e0a37f24 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-set_include_path(__DIR__."/src:".get_include_path());
+set_include_path(__DIR__."/../src:".get_include_path());
 spl_autoload_register(function($class) {
        if (strncmp($class, "pharext\\", strlen("pharext\\"))) {
                return false;
index 3968289819ae888a5c38f0dff99a19241e06871a..e4f80a946bceb5ef19766de2ebee4eec7070bcc5 100644 (file)
@@ -49,7 +49,7 @@ Usage:
     -q|--quiet                   Less output
     -p|--prefix <arg>            PHP installation prefix if phpize is not in \$PATH, e.g. /opt/php7
     -n|--common-name <arg>       PHP common program name, e.g. php5 or zts-php [php]
-    -c|--configure <arg>         Additional extension configure flags, e.g. -c --with-flag
+    -c|--configure <arg>         Additional extension configure flags, e.g. -c --with-flag (MULTIPLE)
     -s|--sudo [<arg>]            Installation might need increased privileges [sudo -S %s]
 
 
index cb1137786124ade2f9ad7e1c94de69e43a05fb97..247b2e5e1e926580ab841cd4b73d735d9beeca28 100644 (file)
@@ -57,10 +57,10 @@ class TaskTest extends \PHPUnit_Framework_TestCase
                        "name" => "json_post",
                        "release" => "1.0.0",
                        "license" => file_get_contents($src->getBaseDir()."/LICENSE"),
-                       "stub" => "pharext_installer.php",
                        "type" => "extension",
                ];
-               $pkg = (new Task\PharBuild($src, $inf))->run();
+               $stb = __DIR__."/../../../src/pharext_installer.php";
+               $pkg = (new Task\PharBuild($src, $stb, $inf))->run();
                $gzp = (new Task\PharCompress($pkg, \Phar::GZ))->run();
                $pkg = (new Task\PharRename($pkg, ".", "json_post-1.0.0"))->run();
                $gzp = (new Task\PharRename($gzp, ".", "json_post-1.0.0"))->run();