1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2024-12-22 21:22:40 +00:00

Slight fixes to Robo and PHPUnit

This commit is contained in:
J. King 2019-08-04 19:21:09 -04:00
parent 246263fa04
commit f360c64327
3 changed files with 10 additions and 7 deletions

View file

@ -119,7 +119,7 @@ class RoboFile extends \Robo\Tasks {
throw new \Exception; throw new \Exception;
} }
$execpath = realpath(self::BASE."vendor-bin/phpunit/vendor/phpunit/phpunit/phpunit"); $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(); $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(); return $this->taskExec($executor)->arg($execpath)->option("-c", $confpath)->args(array_merge($set, $args))->run();
} }

5
robo
View file

@ -1,11 +1,14 @@
#! /bin/sh #! /bin/sh
base=`dirname "$0"` base=`dirname "$0"`
roboCommand="$1" roboCommand="$1"
if [ $# -eq 0 ]; then
"$base/vendor/bin/robo"
else
shift shift
ulimit -n 2048 ulimit -n 2048
if [ "$1" = "clean" ]; then if [ "$1" = "clean" ]; then
"$base/vendor/bin/robo" "$roboCommand" "$@" "$base/vendor/bin/robo" "$roboCommand" "$@"
else else
"$base/vendor/bin/robo" "$roboCommand" -- "$@" "$base/vendor/bin/robo" "$roboCommand" -- "$@"
fi fi
fi