* Added tests for r35776 and r35777

git-svn-id: trunk@35778 -

.gitattributes

@@ -3432,6 +3432,8 @@ packages/fppkg/tests/fppkg_tests.pp svneol=native#text/plain
 packages/fppkg/tests/fullfpcinstallationtests.pas svneol=native#text/plain
 packages/fppkg/tests/packages/base/packagea/fpmake.pp svneol=native#text/plain
 packages/fppkg/tests/packages/base/packagea/src/PackageAUnitA.pas svneol=native#text/plain
+packages/fppkg/tests/packages/base/packageb/fpmake.pp svneol=native#text/plain
+packages/fppkg/tests/packages/base/packageb/src/PackageBUnitB.pas svneol=native#text/plain
 packages/fppkg/tests/readme.txt svneol=native#text/plain
 packages/fuse/Makefile svneol=native#text/plain
 packages/fuse/Makefile.fpc svneol=native#text/plain

packages/fppkg/tests/fullfpcinstallationtests.pas

@@ -29,6 +29,9 @@ type
     procedure IntTestListPackages;
     procedure TestPackageA;
     procedure TestLooseFPMFile;
+    procedure TestMissingSource;
+    procedure TestBuildWithInstalledDependency;
+    procedure TestFakePackageDir;
   end;
 
   { TFullFPCInstallationSetup }
@@ -60,7 +63,7 @@ type
 
 implementation
 
-function RunTestCommandIndir(const Curdir:string; const Exename:string; const Commands:array of string; TaskDescription: string):string;
+function RunTestCommandIndir(const Curdir:string; const Exename:string; const Commands:array of string; TaskDescription: string; ExpectedExitStatus: Integer = 0):string;
 var
   CommandOutput: string;
   i: integer;
@@ -69,7 +72,7 @@ var
 begin
   if RunCommandInDir(Curdir, Exename, Commands, CommandOutput, ExitStatus, [poStderrToOutPut]) <> 0 then
     raise Exception.CreateFmt('Failed to run ''%s''', [exename]);
-  if ExitStatus<>0 then
+  if ExitStatus<>ExpectedExitStatus then
     begin
     for i := 0 to length(Commands) -1 do
       begin
@@ -80,7 +83,7 @@ begin
   result := CommandOutput;
 end;
 
-function RunFppkgIndir(const Curdir:string; Commands: array of string; TaskDescription: string):string;
+function RunFppkgIndir(const Curdir:string; Commands: array of string; TaskDescription: string; ExpectedExitStatus: Integer = 0):string;
 var
   i: Integer;
   StrArr: array of string;
@@ -91,7 +94,7 @@ begin
   StrArr[i+1] := ConcatPaths([TFullFPCInstallationSetup.GetCurrentTestPath,'etc','fppkg.cfg']);
   for i := 0 to length(Commands) -1 do
     StrArr[i] := Commands[i];
-  Result := RunTestCommandIndir(Curdir, TFullFPCInstallationSetup.GetTestBinPath+'fppkg', StrArr, TaskDescription);
+  Result := RunTestCommandIndir(Curdir, TFullFPCInstallationSetup.GetTestBinPath+'fppkg', StrArr, TaskDescription, ExpectedExitStatus);
 end;
 
 function DeleteDirectory(const DirectoryName: string; OnlyChildren: boolean): boolean;
@@ -353,6 +356,69 @@ begin
   Check(pos('Failed to load package "empty"', s) > 0, 'Missing warning that the invalid package is skipped')
 end;
 
+procedure TFullFPCInstallationTests.TestMissingSource;
+var
+  s: String;
+begin
+  TFullFPCInstallationSetup.SyncPackageIntoCurrentTest('packagea');
+  // Build and install package
+  RunFppkgIndir(TFullFPCInstallationSetup.GetCurrentTestBasePackagesPath + 'packagea', ['build'], 'build PackageA');
+  RunFppkgIndir(TFullFPCInstallationSetup.GetCurrentTestBasePackagesPath + 'packagea', ['install'], 'install PackageA');
+
+  // Destroy the installation
+  DeleteFile(ConcatPaths([TFullFPCInstallationSetup.GetCurrentTestPath,'user','lib','fpc', TFullFPCInstallationSetup.GetCompilerVersion, 'units',TFullFPCInstallationSetup.GetTargetString,'PackageA','PackageAUnitA.ppu']));
+
+  // Re-install
+  RunFppkgIndir(TFullFPCInstallationSetup.GetTestPath, ['install', 'packagea'], 're-install PackageA');
+
+  Check(FileExists(ConcatPaths([TFullFPCInstallationSetup.GetCurrentTestPath,'user','lib','fpc', TFullFPCInstallationSetup.GetCompilerVersion, 'units',TFullFPCInstallationSetup.GetTargetString,'PackageA','PackageAUnitA.ppu'])), 'PackageAUnitA.ppu not found after re-install');
+
+  // Remove the original sources
+  DeleteDirectory(TFullFPCInstallationSetup.GetCurrentTestBasePackagesPath + 'packagea', False);
+
+  s := RunFppkgIndir(TFullFPCInstallationSetup.GetTestPath, ['install', 'packagea'], 'Re-install PackageA without source', 1);
+  Check(pos('Source of package packagea is not available', s) > 0, 'Missing warning that the package-source is unavailable. Fppkg-output: ' + s)
+end;
+
+procedure TFullFPCInstallationTests.TestBuildWithInstalledDependency;
+var
+  s: String;
+begin
+  TFullFPCInstallationSetup.SyncPackageIntoCurrentTest('packagea');
+  TFullFPCInstallationSetup.SyncPackageIntoCurrentTest('packageb');
+  // Build and install package
+  RunFppkgIndir(TFullFPCInstallationSetup.GetCurrentTestBasePackagesPath + 'packagea', ['install'], 'install PackageA');
+  RunFppkgIndir(TFullFPCInstallationSetup.GetCurrentTestBasePackagesPath + 'packageb', ['install'], 'install PackageB using the installed dependency PackageA');
+
+  // Test installation
+  s := RunFppkgIndir(TFullFPCInstallationSetup.GetCurrentTestPath, ['list'], 'list packages');
+  Check(pos('PackageA', s) > 0, 'Just installed PackageA is not in package-list');
+  Check(pos('PackageB', s) > 0, 'Just installed PackageB is not in package-list');
+  Check(FileExists(ConcatPaths([TFullFPCInstallationSetup.GetCurrentTestPath,'user','lib','fpc', TFullFPCInstallationSetup.GetCompilerVersion, 'units',TFullFPCInstallationSetup.GetTargetString,'PackageA','PackageAUnitA.ppu'])), 'PackageAUnitA.ppu not found');
+  Check(FileExists(ConcatPaths([TFullFPCInstallationSetup.GetCurrentTestPath,'user','lib','fpc', TFullFPCInstallationSetup.GetCompilerVersion, 'units',TFullFPCInstallationSetup.GetTargetString,'PackageB','PackageBUnitB.ppu'])), 'PackageBUnitB.ppu not found');
+end;
+
+procedure TFullFPCInstallationTests.TestFakePackageDir;
+var
+  s: String;
+begin
+  TFullFPCInstallationSetup.SyncPackageIntoCurrentTest('packagea');
+  TFullFPCInstallationSetup.SyncPackageIntoCurrentTest('packageb');
+  // Build and install package
+  RunFppkgIndir(TFullFPCInstallationSetup.GetCurrentTestBasePackagesPath + 'packagea', ['install', '-i', 'fpc'], 'install PackageA');
+
+  ForceDirectories(ConcatPaths([TFullFPCInstallationSetup.GetCurrentTestPath, 'user', 'lib', 'fpc', TFullFPCInstallationSetup.GetCompilerVersion, 'units', TFullFPCInstallationSetup.GetTargetString, 'PackageA']));
+
+  RunFppkgIndir(TFullFPCInstallationSetup.GetCurrentTestBasePackagesPath + 'packageb', ['install'], 'install PackageB using the installed dependency PackageA');
+
+  // Test installation
+  s := RunFppkgIndir(TFullFPCInstallationSetup.GetCurrentTestPath, ['list'], 'list packages');
+  Check(pos('PackageA', s) > 0, 'Just installed PackageA is not in package-list');
+  Check(pos('PackageB', s) > 0, 'Just installed PackageB is not in package-list');
+  Check(FileExists(ConcatPaths([TFullFPCInstallationSetup.GetCurrentTestPath,'lib','fpc', TFullFPCInstallationSetup.GetCompilerVersion, 'units',TFullFPCInstallationSetup.GetTargetString,'PackageA','PackageAUnitA.ppu'])), 'PackageAUnitA.ppu not found');
+  Check(FileExists(ConcatPaths([TFullFPCInstallationSetup.GetCurrentTestPath,'user','lib','fpc', TFullFPCInstallationSetup.GetCompilerVersion, 'units',TFullFPCInstallationSetup.GetTargetString,'PackageB','PackageBUnitB.ppu'])), 'PackageBUnitB.ppu not found');
+end;
+
 Initialization
   RegisterTestDecorator(TFullFPCInstallationSetup, TFullFPCInstallationTests);
 end.

packages/fppkg/tests/packages/base/packageb/fpmake.pp

@@ -0,0 +1,28 @@
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  P : TPackage;
+  T : TTarget;
+begin
+  With Installer do
+    begin
+    P:=AddPackage('PackageB');
+    P.Version:='4.5.6';
+
+    P.Author := 'Joost vam der Sluis';
+    P.License := 'GPL';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'Basic test-package that depends on PackageA';
+
+    P.Dependencies.Add('PackageA');
+
+    P.SourcePath.Add('src');
+ 
+    T:=P.Targets.AddUnit('PackageBUnitB.pas');
+    Run;
+    end;
+end.

packages/fppkg/tests/packages/base/packageb/src/PackageBUnitB.pas

@@ -0,0 +1,19 @@
+Unit PackageBUnitB;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses 
+  PackageAUnitA;
+
+function PackageBUnitBFunctionB: Boolean;
+
+implementation
+
+function PackageBUnitBFunctionB: Boolean;
+begin
+  Result := PackageAUnitAFunctionA;
+end;
+
+end.