Move phpunit configuration to base directory.

horde · Nov 14, 2017 · c256617 · c256617
1 parent 64970d5
commit c256617
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/package.xml b/package.xml
@@ -69,7 +69,6 @@
        <file name="CbcTest.php" role="test" />
        <file name="EcbTest.php" role="test" />
        <file name="Pbkdf2Test.php" role="test" />
-       <file name="phpunit.xml" role="test" />
       </dir> <!-- /test/Horde/Crypt/Blowfish -->
      </dir> <!-- /test/Horde/Crypt -->
     </dir> <!-- /test/Horde -->
@@ -137,7 +136,6 @@
    <install as="Horde/Crypt/Blowfish/CbcTest.php" name="test/Horde/Crypt/Blowfish/CbcTest.php" />
    <install as="Horde/Crypt/Blowfish/EcbTest.php" name="test/Horde/Crypt/Blowfish/EcbTest.php" />
    <install as="Horde/Crypt/Blowfish/Pbkdf2Test.php" name="test/Horde/Crypt/Blowfish/Pbkdf2Test.php" />
-   <install as="Horde/Crypt/Blowfish/phpunit.xml" name="test/Horde/Crypt/Blowfish/phpunit.xml" />
    <install as="Horde/Crypt/Blowfish/fixtures/vectors.txt" name="test/Horde/Crypt/Blowfish/fixtures/vectors.txt" />
    <install as="Horde/Crypt/Blowfish/fixtures/vectors_cbc.txt" name="test/Horde/Crypt/Blowfish/fixtures/vectors_cbc.txt" />
   </filelist>

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