Skip to content

Commit 6d08532

Browse files
committed
MAGETWO-36072: Move dev/tools/Magento/Tools/Di/compiler.php
- Fixed CompilerTest code integrity test.
1 parent c5e3ebd commit 6d08532

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,17 @@ protected function setUp()
6868
$basePath = \Magento\Framework\App\Utility\Files::init()->getPathToSource();
6969
$basePath = str_replace('\\', '/', $basePath);
7070

71+
7172
$this->_tmpDir = realpath(__DIR__) . '/tmp';
7273
$this->_generationDir = $this->_tmpDir . '/generation';
74+
if (!file_exists($this->_generationDir)) {
75+
mkdir($this->_generationDir, 0777, true);
76+
}
7377
$this->_compilationDir = $this->_tmpDir . '/di';
78+
if (!file_exists($this->_compilationDir)) {
79+
mkdir($this->_compilationDir, 0777, true);
80+
}
81+
7482
$this->_command = 'php ' . $basePath . '/bin/magento setup:di:compile-multi-tenant --generation=%s --di=%s';
7583

7684
$booleanUtils = new \Magento\Framework\Stdlib\BooleanUtils();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
160160
"#^" . $this->directoryList->getRoot() . "/dev/tools/Magento/Tools/[\\w]+/Test#"
161161
];
162162
$fileExcludePatterns = $input->getOption('exclude-pattern') ?
163-
[$input->getOption(self::INPUT_KEY_EXCLUDE_PATTERN)] : ['#[\\\\/]m1[\\\\/]#i'];
163+
[$input->getOption(self::INPUT_KEY_EXCLUDE_PATTERN)] : ['#[\\\\/]M1[\\\\/]#i'];
164164
$fileExcludePatterns = array_merge($fileExcludePatterns, $testExcludePatterns);
165165
/** @var Writer\Console logWriter Writer model for success messages */
166166
$logWriter = new Writer\Console($output);

0 commit comments

Comments
 (0)