aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-06-27 13:07:42 -0700
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-06-27 13:07:42 -0700
commitdf43ddb902726357d5ec2b502d4354aaa30c30a0 (patch)
tree399a305dd614fcde4e46373b7a9df002654da562
parentbe22d28eb942a79d1725a98ac0ab34fe94d4f080 (diff)
parent2269145b4da6f7e2697184f8f3f107c0cbd0672a (diff)
downloadnextcloud-server-df43ddb902726357d5ec2b502d4354aaa30c30a0.tar.gz
nextcloud-server-df43ddb902726357d5ec2b502d4354aaa30c30a0.zip
Merge pull request #3872 from bantu/phpunit-xml-dist
Use phpunit.xml.dist instead of phpunit.xml ...
-rw-r--r--.gitignore5
-rw-r--r--tests/phpunit.xml.dist (renamed from tests/phpunit.xml)0
2 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 68977ad0775..6259482c002 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,7 +72,10 @@ nbproject
.well-known
/.buildpath
-#tests - autogenerated filed
+# Tests
+/tests/phpunit.xml
+
+# Tests - auto-generated files
data-autotest
/tests/coverage*
/tests/autoconfig*
diff --git a/tests/phpunit.xml b/tests/phpunit.xml.dist
index 25dfc64cfeb..25dfc64cfeb 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml.dist