Browse Source

* Files added in %FILES need to be copied to destination directory even if UniqueSuffix is empty, as execution directory is different from source directory

git-svn-id: trunk@34257 -
pierre 9 years ago
parent
commit
ee3d204b72
1 changed files with 9 additions and 12 deletions
  1. 9 12
      tests/utils/dotest.pp

+ 9 - 12
tests/utils/dotest.pp

@@ -1313,21 +1313,18 @@ var
 begin
 begin
   if RemoteAddr='' then
   if RemoteAddr='' then
     begin
     begin
-      If UniqueSuffix<>'' then
+      FileList:=BuildFileList;
+      if assigned(FileList) then
         begin
         begin
-          FileList:=BuildFileList;
-          if assigned(FileList) then
+          LocalPath:=SplitPath(PPFile[current]);
+          if Length(LocalPath) > 0 then
+            LocalPath:=LocalPath+'/';
+          for i:=0 to FileList.count-1 do
             begin
             begin
-              LocalPath:=SplitPath(PPFile[current]);
-              if Length(LocalPath) > 0 then
-                LocalPath:=LocalPath+'/';
-              for i:=0 to FileList.count-1 do
-                begin
-                  LocalFile:=FileList[i];
-                  CopyFile(LocalPath+LocalFile,TestOutputDir+'/'+LocalFile,false);
-                end;
-              FileList.Free;
+              LocalFile:=FileList[i];
+              CopyFile(LocalPath+LocalFile,TestOutputDir+'/'+LocalFile,false);
             end;
             end;
+          FileList.Free;
         end;
         end;
       exit(true);
       exit(true);
     end;
     end;