Browse Source

Slight fixes to Robo and PHPUnit

microsub
J. King 5 years ago
parent
commit
f360c64327
  1. 2
      RoboFile.php
  2. 15
      robo
  3. 0
      tests/phpunit.dist.xml

2
RoboFile.php

@ -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();
} }

15
robo

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

0
tests/phpunit.xml → tests/phpunit.dist.xml

Loading…
Cancel
Save