Move phpunit configuration to base directory.

horde · Nov 14, 2017 · 33973c8 · 33973c8
1 parent 504b025
commit 33973c8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/package.xml b/package.xml
@@ -493,7 +493,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" />
     </dir> <!-- /test/Ingo -->
    </dir> <!-- /test -->
    <dir name="themes">
@@ -885,7 +884,6 @@
    <install as="Ingo/AllTests.php" name="test/Ingo/AllTests.php" />
    <install as="Ingo/Autoload.php" name="test/Ingo/Autoload.php" />
    <install as="Ingo/bootstrap.php" name="test/Ingo/bootstrap.php" />
-   <install as="Ingo/phpunit.xml" name="test/Ingo/phpunit.xml" />
    <install as="Ingo/fixtures/from_spammer" name="test/Ingo/fixtures/from_spammer" />
    <install as="Ingo/fixtures/not_from_spammer" name="test/Ingo/fixtures/not_from_spammer" />
    <install as="Ingo/Unit/MaildropTest.php" name="test/Ingo/Unit/MaildropTest.php" />

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,12 @@
+<phpunit bootstrap="test/Ingo/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/Ingo/phpunit.xml b/test/Ingo/phpunit.xml