included test.core.ecc to the tests project

synopse · Dec 4, 2020 · 4521dbe · 4521dbe
1 parent 6049369
commit 4521dbe
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/src/tools/ecc/mormot.tools.ecc.pas b/src/tools/ecc/mormot.tools.ecc.pas
@@ -652,7 +652,8 @@ function ECCCommand(cmd: TECCCommand; const sw: ICommandLine): TECCCommandError;
                 'Enter the first chars of the .private file name of the signing authority.'#13#10 +
                 'Will create a self-signed certificate if left void.');
             until (auth = '') or
-                  ECCKeyFileFind(auth, true) or sw.NoPrompt;
+                  ECCKeyFileFind(auth, true) or
+                  sw.NoPrompt;
             if auth <> '' then
             begin
               sw.Text('Will use: %'#13#10, [ExtractFileName(auth)]);
@@ -898,7 +899,8 @@ function ECCCommand(cmd: TECCCommand; const sw: ICommandLine): TECCCommandError;
               newfile := SysUtils.Trim(sw.AsString(
                 'Out', origfile + AEAD_FILEEXT,
                 'Enter the name of the encrypted file'));
-            until (newfile <> '') or sw.NoPrompt;
+            until (newfile <> '') or
+                  sw.NoPrompt;
             authpass := sw.AsUTF8('Pass', '',
               'Enter the PassPhrase to be used for encryption.');
             savepass := sw.AsUTF8('Salt', 'salt',

diff --git a/test/mormot2tests.dpr b/test/mormot2tests.dpr
@@ -97,10 +97,13 @@ uses
   //mormot.db.rad.unidac     in '..\src\db\mormot.db.rad.unidac.pas',
   //mormot.db.rad.nexusdb    in '..\src\db\mormot.db.rad.nexusdb.pas',
   {$endif FPC}
+  mormot.app.console       in '..\src\app\mormot.app.console.pas',
   mormot.app.daemon        in '..\src\app\mormot.app.daemon.pas',
+  mormot.tools.ecc         in '..\src\tools\ecc\mormot.tools.ecc.pas',
   test.core.base           in '.\test.core.base.pas',
   test.core.data           in '.\test.core.data.pas',
-  test.core.crypto         in '.\test.core.crypto.pas';
+  test.core.crypto         in '.\test.core.crypto.pas',
+  test.core.ecc            in '.\test.core.ecc.pas';
 
 
 { TIntegrationTests }
@@ -113,10 +116,11 @@ type
 
 procedure TIntegrationTests.CoreUnits;
 begin
+  AddCase([
   //
-  AddCase([TTestCoreBase, TTestCoreProcess, TTestCoreCrypto, TTestCoreCompress]);
-  //
-  AddCase([]);
+    TTestCoreBase, TTestCoreProcess, TTestCoreCrypto, TTestCoreEcc, TTestCoreCompress
+  // ,
+  ]);
 end;
 
 

diff --git a/test/mormot2tests.lpi b/test/mormot2tests.lpi
@@ -190,7 +190,7 @@
           <SearchPaths>
             <IncludeFiles Value="..\src;..\src\core;$(ProjOutDir)"/>
             <Libraries Value="..\static\$(TargetCPU)-$(TargetOS)"/>
-            <OtherUnitFiles Value="..\src;..\src\core;..\src\db;..\src\rest;..\src\lib;..\src\net;..\src\orm;..\src\soa"/>
+            <OtherUnitFiles Value="..\src;..\src\core;..\src\app;..\src\db;..\src\rest;..\src\lib;..\src\net;..\src\tools\ecc;..\src\orm;..\src\soa"/>
             <UnitOutputDirectory Value="fpc\lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Conditionals Value="if TargetOS='darwin' then
@@ -551,7 +551,7 @@
         <Mode0 Name="default"/>
       </Modes>
     </RunParams>
-    <Units Count="80">
+    <Units Count="83">
       <Unit0>
         <Filename Value="mormot2tests.dpr"/>
         <IsPartOfProject Value="True"/>
@@ -872,6 +872,18 @@
         <Filename Value="test.core.data.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit79>
+      <Unit80>
+        <Filename Value="test.core.ecc.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit80>
+      <Unit81>
+        <Filename Value="..\src\app\mormot.app.console.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit81>
+      <Unit82>
+        <Filename Value="..\src\tools\ecc\mormot.tools.ecc.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit82>
     </Units>
   </ProjectOptions>
   <CompilerOptions>