Fix regular expressions for 'exclude tests'

Author: fredden

setup/src/Magento/Setup/Console/Command/DiCompileCommand.php

@@ -256,8 +256,8 @@ private function getExcludedModulePaths(array $modulePaths)
         }
 
         $excludedModulePaths = [
-            '#^(?:' . join('|', $basePathsRegExps) . ')/Test#',
-            '#^(?:' . join('|', $basePathsRegExps) . ')/tests#',
+            '#^(?:' . join('|', $basePathsRegExps) . ')/Tests?/#',
+            '#^(?:' . join('|', $basePathsRegExps) . ')/tests/#',
         ];
         return $excludedModulePaths;
     }
@@ -278,8 +278,8 @@ function ($libraryPath) {
         );
 
         $excludedLibraryPaths = [
-            '#^(?:' . join('|', $libraryPaths) . ')/([\\w]+/)?Test#',
-            '#^(?:' . join('|', $libraryPaths) . ')/([\\w]+/)?tests#',
+            '#^(?:' . join('|', $libraryPaths) . ')/([\\w]+/)?Tests?/#',
+            '#^(?:' . join('|', $libraryPaths) . ')/([\\w]+/)?tests/#',
         ];
         return $excludedLibraryPaths;
     }
@@ -293,7 +293,7 @@ function ($libraryPath) {
     private function getExcludedSetupPaths($setupPath)
     {
         return [
-            '#^(?:' . preg_quote($setupPath, '#') . ')(/[\\w]+)*/Test#'
+            '#^(?:' . preg_quote($setupPath, '#') . ')(/[\\w]+)*/Tests?/#'
         ];
     }