Browse Source

Slight fixes to Robo and PHPUnit

tags/0.8.1
J. King 4 months ago
parent
commit
f360c64327
3 changed files with 10 additions and 7 deletions
  1. 1
    1
      RoboFile.php
  2. 9
    6
      robo
  3. 0
    0
      tests/phpunit.dist.xml

+ 1
- 1
RoboFile.php View File

@@ -119,7 +119,7 @@ class RoboFile extends \Robo\Tasks {
throw new \Exception;
}
$execpath = realpath(self::BASE."vendor-bin/phpunit/vendor/phpunit/phpunit/phpunit");
$confpath = realpath(self::BASE_TEST."phpunit.xml");
$confpath = realpath(self::BASE_TEST."phpunit.dist.xml") ?: realpath(self::BASE_TEST."phpunit.xml");
$this->taskServer(8000)->host("localhost")->dir(self::BASE_TEST."docroot")->rawArg("-n")->arg(self::BASE_TEST."server.php")->rawArg($this->blackhole())->background()->run();
return $this->taskExec($executor)->arg($execpath)->option("-c", $confpath)->args(array_merge($set, $args))->run();
}

+ 9
- 6
robo View File

@@ -1,11 +1,14 @@
#! /bin/sh
base=`dirname "$0"`
roboCommand="$1"
shift

ulimit -n 2048
if [ "$1" = "clean" ]; then
"$base/vendor/bin/robo" "$roboCommand" "$@"
if [ $# -eq 0 ]; then
"$base/vendor/bin/robo"
else
"$base/vendor/bin/robo" "$roboCommand" -- "$@"
shift
ulimit -n 2048
if [ "$1" = "clean" ]; then
"$base/vendor/bin/robo" "$roboCommand" "$@"
else
"$base/vendor/bin/robo" "$roboCommand" -- "$@"
fi
fi

tests/phpunit.xml → tests/phpunit.dist.xml View File


Loading…
Cancel
Save