From 121e4ca395f05b6dff8903650a71a95cd4a3a229 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 27 Jun 2013 16:31:31 +0200 Subject: [PATCH 1/3] PHPUnit: Allow developers to use their own custom phpunit.xml file. The order of precedence of configuration files for PHPUnit is: - phpunit.xml (allowing custom user defined configuration) - phpunit.xml.dist (configuration distributed with the software) --- tests/{phpunit.xml => phpunit.xml.dist} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{phpunit.xml => phpunit.xml.dist} (100%) diff --git a/tests/phpunit.xml b/tests/phpunit.xml.dist similarity index 100% rename from tests/phpunit.xml rename to tests/phpunit.xml.dist From d015b9219c0a4856490df38bf144115a1048ef8e Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 27 Jun 2013 16:44:55 +0200 Subject: [PATCH 2/3] PHPUnit: Add tests/phpunit.xml to gitignore. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 68977ad0775..c96ca421359 100644 --- a/.gitignore +++ b/.gitignore @@ -72,6 +72,9 @@ nbproject .well-known /.buildpath +# Tests +/tests/phpunit.xml + #tests - autogenerated filed data-autotest /tests/coverage* From 2269145b4da6f7e2697184f8f3f107c0cbd0672a Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 27 Jun 2013 16:50:17 +0200 Subject: [PATCH 3/3] gitignore: Fix typo + adjust comment format. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c96ca421359..6259482c002 100644 --- a/.gitignore +++ b/.gitignore @@ -75,7 +75,7 @@ nbproject # Tests /tests/phpunit.xml -#tests - autogenerated filed +# Tests - auto-generated files data-autotest /tests/coverage* /tests/autoconfig*