From 9618a04e2346bef187cc862d35edaea204e4a57e Mon Sep 17 00:00:00 2001 From: Toni Uebernickel Date: Thu, 12 Jan 2012 17:42:34 +0100 Subject: [PATCH] fix distributed testing environment --- Tests/autoload.php.dist | 3 +++ phpunit.xml.dist | 1 + vendor/install_vendors.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Tests/autoload.php.dist b/Tests/autoload.php.dist index f6fffe4..3c31b6c 100644 --- a/Tests/autoload.php.dist +++ b/Tests/autoload.php.dist @@ -10,6 +10,9 @@ $loader->registerNamespaces(array( 'Symfony' => array($vendorDir.'/symfony/src'), 'Sensio\\Bundle\\FrameworkExtraBundle' => array($vendorDir), )); +$loader->registerPrefixes(array( + 'Twig_' => $vendorDir.'/symfony/vendor/twig/lib', +)); $loader->register(); set_include_path(get_include_path() . PATH_SEPARATOR . $vendorDir.'/phing/classes'); diff --git a/phpunit.xml.dist b/phpunit.xml.dist index cabfb69..9725b13 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -22,6 +22,7 @@ ./ ./Tests + ./vendor diff --git a/vendor/install_vendors.php b/vendor/install_vendors.php index cec7683..bdeefb8 100755 --- a/vendor/install_vendors.php +++ b/vendor/install_vendors.php @@ -23,3 +23,5 @@ foreach ($deps as $dep) { system(sprintf('cd %s && git fetch -q origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev))); } + +system(sprintf('cd %s && php vendors.php', escapeshellarg($vendorDir.'/symfony')));