Move phpunit configuration to base directory.

horde · Nov 14, 2017 · 2b008ae · 2b008ae
1 parent 71b9466
commit 2b008ae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/package.xml b/package.xml
@@ -581,7 +581,6 @@
      <file name="AllTests.php" role="test" />
      <file name="Autoload.php" role="test" />
      <file name="bootstrap.php" role="test" />
-     <file name="phpunit.xml" role="test" />
      <file name="TestCase.php" role="test" />
     </dir> <!-- /test/Turba -->
    </dir> <!-- /test -->
@@ -1120,7 +1119,6 @@
    <install as="Turba/AllTests.php" name="test/Turba/AllTests.php" />
    <install as="Turba/Autoload.php" name="test/Turba/Autoload.php" />
    <install as="Turba/bootstrap.php" name="test/Turba/bootstrap.php" />
-   <install as="Turba/phpunit.xml" name="test/Turba/phpunit.xml" />
    <install as="Turba/TestCase.php" name="test/Turba/TestCase.php" />
    <install as="Turba/fixtures/az.png" name="test/Turba/fixtures/az.png" />
    <install as="Turba/fixtures/bug_6518.ldif" name="test/Turba/fixtures/bug_6518.ldif" />

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,12 @@
+<phpunit bootstrap="test/Turba/bootstrap.php" colors="true">
+  <testsuites>
+    <testsuite>
+      <directory>test</directory>
+    </testsuite>
+  </testsuites>
+  <filter>
+    <whitelist>
+      <directory suffix=".php">lib</directory>
+    </whitelist>
+  </filter>
+</phpunit>
diff --git a/test/Turba/phpunit.xml b/test/Turba/phpunit.xml