Browse Source

+ NEEDEDAFTER to avoid deleting created files if needed for another test

git-svn-id: trunk@14405 -
pierre 15 years ago
parent
commit
a440104065
4 changed files with 9 additions and 2 deletions
  1. 1 0
      tests/test/targ1a.pp
  2. 1 0
      tests/test/units/sysutils/texec1.pp
  3. 3 2
      tests/utils/dotest.pp
  4. 4 0
      tests/utils/testu.pp

+ 1 - 0
tests/test/targ1a.pp

@@ -1,3 +1,4 @@
+{ %NEEDEDAFTER }
 program go32v2_crash;
 program go32v2_crash;
 
 
 const
 const

+ 1 - 0
tests/test/units/sysutils/texec1.pp

@@ -1,4 +1,5 @@
 { %result=1 }
 { %result=1 }
+{ %NEEDEDAFTER }
 { this test fails when it isn't called by execansi }
 { this test fails when it isn't called by execansi }
   uses
   uses
     sysutils;
     sysutils;

+ 3 - 2
tests/utils/dotest.pp

@@ -819,7 +819,8 @@ begin
         execcmd:=execcmd+s;
         execcmd:=execcmd+s;
       end;
       end;
       execcmd:=execcmd+' '+TestRemoteExe+' ; echo "TestExitCode: $?"';
       execcmd:=execcmd+' '+TestRemoteExe+' ; echo "TestExitCode: $?"';
-      if deAfter in DelExecutable then
+      if (deAfter in DelExecutable) and
+         not Config.NeededAfter then
         execcmd:=execcmd+' ; rm -f '+TestRemoteExe;
         execcmd:=execcmd+' ; rm -f '+TestRemoteExe;
       execcmd:=execcmd+rquote;
       execcmd:=execcmd+rquote;
       execres:=ExecuteRemote(rshprog,execcmd);
       execres:=ExecuteRemote(rshprog,execcmd);
@@ -899,7 +900,7 @@ done:
      RunExecutable:=true;
      RunExecutable:=true;
    end;
    end;
 
 
-  if deAfter in DelExecutable then
+  if (deAfter in DelExecutable) and not Config.NeededAfter then
     begin
     begin
       Verbose(V_Debug,'Deleting executable '+TestExe);
       Verbose(V_Debug,'Deleting executable '+TestExe);
       RemoveFile(TestExe);
       RemoveFile(TestExe);

+ 4 - 0
tests/utils/testu.pp

@@ -28,6 +28,7 @@ type
     KnownCompileError : longint;
     KnownCompileError : longint;
     NeedRecompile : boolean;
     NeedRecompile : boolean;
     NeedLibrary   : boolean;
     NeedLibrary   : boolean;
+    NeededAfter   : boolean;
     IsInteractive : boolean;
     IsInteractive : boolean;
     IsKnownRunError,
     IsKnownRunError,
     IsKnownCompileError : boolean;
     IsKnownCompileError : boolean;
@@ -212,6 +213,9 @@ begin
               else
               else
                if GetEntry('NEEDLIBRARY') then
                if GetEntry('NEEDLIBRARY') then
                 r.NeedLibrary:=true
                 r.NeedLibrary:=true
+              else
+               if GetEntry('NEEDEDAFTER') then
+                r.NeededAfter:=true
               else
               else
                if GetEntry('KNOWNRUNERROR') then
                if GetEntry('KNOWNRUNERROR') then
                 begin
                 begin