Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Cleaning up phar, test bootstrap, and loading build.properties.dist b…

…y default.
  • Loading branch information...
commit a280594ffbb1b563a0f042182221f39e7de9efa3 1 parent 4e9e345
@mtdowling mtdowling authored
Showing with 3 additions and 16 deletions.
  1. +1 −0  build.xml
  2. +1 −2  phing/imports/deploy.xml
  3. +1 −14 tests/bootstrap.php
View
1  build.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="guzzle" default="test">
<!-- set local values, like git location -->
+ <property file="phing/build.properties.dist" override="true" />
<property file="phing/build.properties" override="true" />
<property name="dir.output" value="${project.basedir}/build/artifacts" />
View
3  phing/imports/deploy.xml
@@ -122,7 +122,7 @@
/>
</target>
- <target name="package-phar" depends="test-init" description="Create a phar with an autoloader">
+ <target name="package-phar" description="Create a phar with an autoloader">
<pharpackage
destfile="${dir.output}/guzzle.phar"
basedir="${project.basedir}/.subsplit"
@@ -141,7 +141,6 @@
<element name="author" value="Michael Dowling" />
</metadata>
</pharpackage>
- <exec command="php -d guzzle_phar=${dir.output}/guzzle.phar `which phpunit`" passthru="true" />
</target>
</project>
View
15 tests/bootstrap.php
@@ -2,21 +2,8 @@
error_reporting(E_ALL | E_STRICT);
-// Ensure that composer has installed all dependencies
-if (!file_exists(dirname(__DIR__) . '/composer.lock')) {
- die("Dependencies must be installed using composer:\n\nphp composer.phar install --dev\n\n"
- . "See http://getcomposer.org for help with installing composer\n");
-}
-
require_once 'PHPUnit/TextUI/TestRunner.php';
-
-// Include the phar files if testing against the phars
-if (get_cfg_var('guzzle_phar')) {
- require get_cfg_var('guzzle_phar');
-}
-
-// Include the composer autoloader
-$autoloader = require dirname(__DIR__) . '/vendor/autoload.php';
+require dirname(__DIR__) . '/vendor/autoload.php';
// Add the services file to the default service builder
$servicesFile = __DIR__ . '/Guzzle/Tests/TestData/services/services.json';
Please sign in to comment.
Something went wrong with that request. Please try again.