From 50a7f29565489ff5089950bd3f6cb9fffb65c735 Mon Sep 17 00:00:00 2001 From: webchick <webchick@24967.no-reply.drupal.org> Date: Mon, 7 Oct 2013 09:56:43 -0700 Subject: [PATCH] Issue #2056607 by Mile23, becw: Fixed /core/phpunit.xml.dist only finds top-level contrib modules. --- core/phpunit.xml.dist | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/core/phpunit.xml.dist b/core/phpunit.xml.dist index 6ca7e89f8031..35ff2540cf20 100644 --- a/core/phpunit.xml.dist +++ b/core/phpunit.xml.dist @@ -3,14 +3,22 @@ <phpunit bootstrap="tests/bootstrap.php" colors="true"> <testsuites> <testsuite name="Drupal Unit Test Suite"> - <directory>./tests/*</directory> - <directory>./modules/*/tests/*</directory> - <directory>../modules/*/tests/*</directory> - <directory>../sites/*/modules/*/tests/*</directory> - <!-- Exclude files that end in Test.php that aren't actually phpunit tests. --> + <directory>./tests</directory> + <directory>./modules/*/tests</directory> + <directory>../modules</directory> + <directory>../sites/*/modules</directory> + <!-- Exclude Composer's vendor directory so we don't run tests there. --> + <exclude>./vendor</exclude> + <!-- Exclude Drush tests. --> + <exclude>./drush/tests</exclude> + <!-- Exclude special-case files from config's test modules. --> <exclude>./modules/config/tests/config_test/lib/Drupal/config_test</exclude> - <exclude>./modules/views/tests/views_test_data/lib/Drupal/views_test_data</exclude> </testsuite> </testsuites> + <!-- Filter for coverage reports. --> + <filter> + <blacklist> + <directory>./vendor</directory> + </blacklist> + </filter> </phpunit> - -- GitLab