Move phpunit configuration to base directory.

horde · Nov 14, 2017 · 3b0a2e4 · 3b0a2e4
1 parent c79b5ef
commit 3b0a2e4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/package.xml b/package.xml
@@ -64,7 +64,6 @@
       <file name="AllTests.php" role="test" />
       <file name="bootstrap.php" role="test" />
       <file name="conf.php.dist" role="test" />
-      <file name="phpunit.xml" role="test" />
      </dir> <!-- /test/Horde/Lock -->
     </dir> <!-- /test/Horde -->
    </dir> <!-- /test -->
@@ -134,7 +133,6 @@
    <install as="Horde/Lock/AllTests.php" name="test/Horde/Lock/AllTests.php" />
    <install as="Horde/Lock/bootstrap.php" name="test/Horde/Lock/bootstrap.php" />
    <install as="Horde/Lock/conf.php.dist" name="test/Horde/Lock/conf.php.dist" />
-   <install as="Horde/Lock/phpunit.xml" name="test/Horde/Lock/phpunit.xml" />
    <install as="Horde/Lock/Storage/MongoTest.php" name="test/Horde/Lock/Storage/MongoTest.php" />
    <install as="Horde/Lock/Storage/SqlTest.php" name="test/Horde/Lock/Storage/SqlTest.php" />
    <install as="Horde/Lock/Storage/TestBase.php" name="test/Horde/Lock/Storage/TestBase.php" />

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