Move phpunit configuration to base directory.

horde · Nov 14, 2017 · af0f666 · af0f666
1 parent 67d71ef
commit af0f666
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/package.xml b/package.xml
@@ -124,7 +124,6 @@
      <file name="Base.php" role="test" />
      <file name="bootstrap.php" role="test" />
      <file name="conf.php.dist" role="test" />
-     <file name="phpunit.xml" role="test" />
     </dir> <!-- /test/Content -->
    </dir> <!-- /test -->
    <file name=".htaccess" role="horde" />
@@ -265,7 +264,6 @@
    <install as="Content/Base.php" name="test/Content/Base.php" />
    <install as="Content/bootstrap.php" name="test/Content/bootstrap.php" />
    <install as="Content/conf.php.dist" name="test/Content/conf.php.dist" />
-   <install as="Content/phpunit.xml" name="test/Content/phpunit.xml" />
    <install as="Content/Sql/Base.php" name="test/Content/Sql/Base.php" />
    <install as="Content/Sql/MysqliTest.php" name="test/Content/Sql/MysqliTest.php" />
    <install as="Content/Sql/MysqlTest.php" name="test/Content/Sql/MysqlTest.php" />

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