Minor tweaks to how PHPUnit-loading code deals with standalone phar a…

…rchive.
gallery · Apr 28, 2013 · 1757c89 · 1757c89
1 parent 2797e60
commit 1757c89
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/modules/gallery_unittest/classes/GalleryUnittest/Controller/GalleryUnittest.php b/modules/gallery_unittest/classes/GalleryUnittest/Controller/GalleryUnittest.php
@@ -106,15 +106,15 @@ public function action_index() {
       $_SERVER["argv"][] = MODPATH . "unittest/tests.php";
 
       // Look for PHPUnit in a bunch of reasonable places
-      foreach (array("phar://" . DOCROOT . "phpunit.phar",
+      foreach (array("phar://" . DOCROOT . "bin/phpunit.phar",
                      "/usr/local/php/PHPUnit/Autoload.php",
                      "/usr/share/php/PHPUnit/Autoload.php") as $path) {
         @include $path;
       }
 
       if (!function_exists("phpunit_autoload")) {
-        print "PHPUnit not found, aborting.  To install PHPUnit: \n";
-        print "  $ cd gallery3\n";
+        print "PHPUnit not found, aborting.  To download and use a standalone version of PHPUnit: \n";
+        print "  $ cd gallery3/bin\n";
         print "  $ wget http://pear.phpunit.de/get/phpunit.phar\n";
         exit(1);
       }