mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-25 21:34:12 +01:00
Compare commits
6 Commits
develop
...
issue/7446
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7f99c5c218 | ||
|
|
087c60f2b3 | ||
|
|
c6d7bc545e | ||
|
|
998d27ac8a | ||
|
|
2f8043d03a | ||
|
|
0a9c36bdaa |
@@ -13,6 +13,7 @@ use RecursiveDirectoryIterator;
|
|||||||
use RecursiveIteratorIterator;
|
use RecursiveIteratorIterator;
|
||||||
use ReflectionClass;
|
use ReflectionClass;
|
||||||
use RunTimeEnvironment;
|
use RunTimeEnvironment;
|
||||||
|
use SetupUtils;
|
||||||
use utils;
|
use utils;
|
||||||
|
|
||||||
|
|
||||||
@@ -47,11 +48,23 @@ class UnitTestRunTimeEnvironment extends RunTimeEnvironment
|
|||||||
return $this->sFinalEnv;
|
return $this->sFinalEnv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function CompileFrom($sSourceEnv, $bUseSymLinks = null)
|
||||||
|
{
|
||||||
|
$sDestModulesDir = APPROOT.'data/'.$this->sTargetEnv.'-modules/';
|
||||||
|
if (is_dir($sDestModulesDir)) {
|
||||||
|
SetupUtils::rrmdir($sDestModulesDir);
|
||||||
|
}
|
||||||
|
|
||||||
|
SetupUtils::copydir(APPROOT.'/data/'.$sSourceEnv.'-modules', $sDestModulesDir, $bUseSymLinks);
|
||||||
|
|
||||||
|
parent::CompileFrom($sSourceEnv, $bUseSymLinks);
|
||||||
|
}
|
||||||
|
|
||||||
public function IsUpToDate()
|
public function IsUpToDate()
|
||||||
{
|
{
|
||||||
clearstatcache();
|
clearstatcache();
|
||||||
$fLastCompilationTime = filemtime(APPROOT.'env-'.$this->sFinalEnv);
|
$fLastCompilationTime = filemtime(APPROOT.'env-'.$this->sFinalEnv);
|
||||||
$aModifiedFiles = [];
|
$aModifiedFiles = [];
|
||||||
$this->FindFilesModifiedAfter($fLastCompilationTime, APPROOT.'datamodels/2.x', $aModifiedFiles);
|
$this->FindFilesModifiedAfter($fLastCompilationTime, APPROOT.'datamodels/2.x', $aModifiedFiles);
|
||||||
$this->FindFilesModifiedAfter($fLastCompilationTime, APPROOT.'extensions', $aModifiedFiles);
|
$this->FindFilesModifiedAfter($fLastCompilationTime, APPROOT.'extensions', $aModifiedFiles);
|
||||||
$this->FindFilesModifiedAfter($fLastCompilationTime, APPROOT.'data/production-modules', $aModifiedFiles);
|
$this->FindFilesModifiedAfter($fLastCompilationTime, APPROOT.'data/production-modules', $aModifiedFiles);
|
||||||
@@ -63,11 +76,11 @@ class UnitTestRunTimeEnvironment extends RunTimeEnvironment
|
|||||||
if (count($aModifiedFiles) > 0) {
|
if (count($aModifiedFiles) > 0) {
|
||||||
echo "The following files have been modified after the last compilation:\n";
|
echo "The following files have been modified after the last compilation:\n";
|
||||||
foreach ($aModifiedFiles as $sFile) {
|
foreach ($aModifiedFiles as $sFile) {
|
||||||
echo " - $sFile\n";
|
echo " - $sFile\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return (count($aModifiedFiles) === 0);
|
return (count($aModifiedFiles) === 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
@@ -131,7 +144,6 @@ class UnitTestRunTimeEnvironment extends RunTimeEnvironment
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (in_array($sClass, $aLoadedTestClasses)) {
|
if (in_array($sClass, $aLoadedTestClasses)) {
|
||||||
echo "class $sClass already loaded somehow \n";
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$aLoadedTestClasses[]=$sClass;
|
$aLoadedTestClasses[]=$sClass;
|
||||||
|
|||||||
Reference in New Issue
Block a user