From 6d085327ab4df36eac90debbe5ae429982687e9d Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@ebay.com>
Date: Mon, 27 Apr 2015 14:57:10 -0500
Subject: [PATCH] MAGETWO-36072: Move dev/tools/Magento/Tools/Di/compiler.php
- Fixed CompilerTest code integrity test.
---
.../testsuite/Magento/Test/Integrity/Di/CompilerTest.php | 8 ++++++++
.../Setup/Console/Command/DiCompileMultiTenantCommand.php | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
index f947b55c93f..23fcd366b33 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
@@ -68,9 +68,17 @@ class CompilerTest extends \PHPUnit_Framework_TestCase
$basePath = \Magento\Framework\App\Utility\Files::init()->getPathToSource();
$basePath = str_replace('\\', '/', $basePath);
+
$this->_tmpDir = realpath(__DIR__) . '/tmp';
$this->_generationDir = $this->_tmpDir . '/generation';
+ if (!file_exists($this->_generationDir)) {
+ mkdir($this->_generationDir, 0777, true);
+ }
$this->_compilationDir = $this->_tmpDir . '/di';
+ if (!file_exists($this->_compilationDir)) {
+ mkdir($this->_compilationDir, 0777, true);
+ }
+
$this->_command = 'php ' . $basePath . '/bin/magento setup:di:compile-multi-tenant --generation=%s --di=%s';
$booleanUtils = new \Magento\Framework\Stdlib\BooleanUtils();
diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php
index e533f7650ca..6f37a57c9c0 100644
--- a/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php
@@ -160,7 +160,7 @@ class DiCompileMultiTenantCommand extends AbstractSetupCommand
"#^" . $this->directoryList->getRoot() . "/dev/tools/Magento/Tools/[\\w]+/Test#"
];
$fileExcludePatterns = $input->getOption('exclude-pattern') ?
- [$input->getOption(self::INPUT_KEY_EXCLUDE_PATTERN)] : ['#[\\\\/]m1[\\\\/]#i'];
+ [$input->getOption(self::INPUT_KEY_EXCLUDE_PATTERN)] : ['#[\\\\/]M1[\\\\/]#i'];
$fileExcludePatterns = array_merge($fileExcludePatterns, $testExcludePatterns);
/** @var Writer\Console logWriter Writer model for success messages */
$logWriter = new Writer\Console($output);
--
GitLab