Compare commits

...

6 Commits

Author SHA1 Message Date
odain
7f99c5c218 Fix again ci 2024-12-05 11:21:22 +01:00
odain
087c60f2b3 Make ItopCustomDatamodelTestCase work with modules in production-modules 2024-12-05 10:55:53 +01:00
odain
c6d7bc545e debug again 2024-11-29 17:49:40 +01:00
odain
998d27ac8a debug again 2024-11-29 17:29:24 +01:00
odain
2f8043d03a N°7446 - fix again 2024-11-29 17:06:48 +01:00
odain
0a9c36bdaa N°7446 - fix again 2024-11-29 16:50:03 +01:00

View File

@@ -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;