* remove failed_to_execute_ strings, use the failed_to_run

tests/utils/dbdigest.pp

@@ -33,8 +33,6 @@ Type
   stFailedToRun,
   stKnownRunProblem,
   stSuccessFullyRun,
-  stFailedExecuteCompiler,
-  stFailedExecuteTest,
   stSkippingGraphTest,
   stSkippingInteractiveTest,
   stSkippingKnownBug,
@@ -59,8 +57,6 @@ Const
     False, // stFailedToRun,
     True,  // stKnownRunProblem,
     True,  // stSuccessFullyRun,
-    False, // stFailedExecuteCompiler
-    False, // stFailedExecuteTest
     False, // stSkippingGraphTest,
     False, // stSkippingInteractiveTest,
     False, // stSkippingKnownBug,
@@ -80,8 +76,6 @@ Const
     False,  // stFailedToRun,
     False,  // stKnownRunProblem,
     False,  // stSuccessFullyRun,
-    False,  // stFailedExecuteCompiler
-    False,  // stFailedExecuteTest
     True,   // stSkippingGraphTest,
     True,   // stSkippingInteractiveTest,
     True,   // stSkippingKnownBug,
@@ -101,8 +95,6 @@ Const
     False,  // stFailedToRun,
     False,  // stKnownRunProblem,
     False,  // stSuccessFullyRun,
-    False,  // stFailedExecuteCompiler
-    False,  // stFailedExecuteTest
     False,  // stSkippingGraphTest,
     False,  // stSkippingInteractiveTest,
     False,  // stSkippingKnownBug,
@@ -122,8 +114,6 @@ Const
     failed_to_run ,
     known_problem ,
     successfully_run ,
-    failed_to_execute_compiler,
-    failed_to_execute_test,
     skipping_graph_test ,
     skipping_interactive_test ,
     skipping_known_bug ,
@@ -143,8 +133,6 @@ Const
     'TU_FAILEDTORUN',
     'TU_KNOWNPROBLEM',
     'TU_SUCCESSFULLYRUN',
-    'TU_FAILEDTOCOMPILE',   // Combined with compiler failures
-    'TU_FAILEDTORUN',       // Combined with compiler failures  
     'TU_SKIPPEDGRAPHTEST',
     'TU_SKIPPEDINTERACTIVETEST',
     'TU_KNOWNBUG',
@@ -487,7 +475,10 @@ end.
 
 {
   $Log$
-  Revision 1.12  2004-04-29 22:03:18  peter
+  Revision 1.13  2004-05-02 09:31:52  peter
+    * remove failed_to_execute_ strings, use the failed_to_run
+
+  Revision 1.12  2004/04/29 22:03:18  peter
     * support new execute errors
 
   Revision 1.11  2003/10/17 08:08:07  florian

tests/utils/digest.pp

@@ -54,7 +54,6 @@ begin
   should_be_run:=next_should_be_run;
   if next_should_be_run and
      (pos(failed_to_run,st)<>1) and
-     (pos(failed_to_execute_test,st)<>1) and
      (pos(successfully_run,st)<>1) and
      (pos(skipping_known_bug,st)<>1) and
      (pos(skipping_run_test,st)<>1) and
@@ -63,7 +62,7 @@ begin
       Writeln('No run found for "',prevline,'"');
     end;
   next_should_be_run:=false;
-  if (pos(failed_to_compile,st)=1) or (pos(failed_to_execute_compiler,st)=1) then
+  if pos(failed_to_compile,st)=1 then
     begin
       inc(failed_to_compile_count);
     end
@@ -80,7 +79,7 @@ begin
       inc(successfully_compiled_count);
       next_should_be_run:=true;
     end
-  else if (pos(failed_to_run,st)=1) or (pos(failed_to_execute_test,st)=1) then
+  else if (pos(failed_to_run,st)=1) then
     begin
       inc(failed_to_run_count);
       if not should_be_run then
@@ -241,7 +240,10 @@ end.
 
 {
   $Log$
-  Revision 1.6  2004-04-29 22:03:18  peter
+  Revision 1.7  2004-05-02 09:31:52  peter
+    * remove failed_to_execute_ strings, use the failed_to_run
+
+  Revision 1.6  2004/04/29 22:03:18  peter
     * support new execute errors
 
   Revision 1.5  2003/10/31 16:51:46  peter

tests/utils/dotest.pp

@@ -396,12 +396,12 @@ begin
   if (not execres) and (ExecuteResult=0) then
     begin
       AddLog(FailLogFile,TestName);
-      AddLog(ResLogFile,failed_to_execute_compiler+PPFileInfo);
+      AddLog(ResLogFile,failed_to_compile+PPFileInfo);
       AddLog(LongLogFile,line_separation);
-      AddLog(LongLogFile,failed_to_execute_compiler+PPFileInfo);
+      AddLog(LongLogFile,failed_to_compile+PPFileInfo);
       CopyFile(OutName,LongLogFile,true);
       { avoid to try again }
-      AddLog(ForceExtension(PPFile,'elg'),failed_to_execute_compiler+PPFileInfo);
+      AddLog(ForceExtension(PPFile,'elg'),failed_to_compile+PPFileInfo);
       Verbose(V_Abort,'IOStatus: '+ToStr(IOStatus));
       exit;
     end;
@@ -494,7 +494,7 @@ var
   execres  : boolean;
 begin
   RunExecutable:=false;
-  execres:=true;	
+  execres:=true;
   TestExe:=ForceExtension(PPFile,ExeExt);
   OutName:=ForceExtension(PPFile,'elg');
   Verbose(V_Debug,'Executing '+TestExe);
@@ -519,17 +519,17 @@ begin
         execres:=ExecuteRedir(TestExe,'','',OutName,'');
     end;
   Verbose(V_Debug,'Exitcode '+ToStr(ExecuteResult));
-  
+
   { Error during execution? }
   if (not execres) and (ExecuteResult=0) then
     begin
       AddLog(FailLogFile,TestName);
-      AddLog(ResLogFile,failed_to_execute_test+PPFileInfo);
+      AddLog(ResLogFile,failed_to_run+PPFileInfo);
       AddLog(LongLogFile,line_separation);
-      AddLog(LongLogFile,failed_to_execute_test+PPFileInfo);
+      AddLog(LongLogFile,failed_to_run+PPFileInfo);
       CopyFile(OutName,LongLogFile,true);
       { avoid to try again }
-      AddLog(ForceExtension(PPFile,'elg'),failed_to_execute_test+PPFileInfo);
+      AddLog(ForceExtension(PPFile,'elg'),failed_to_run+PPFileInfo);
       Verbose(V_Abort,'IOStatus: '+ToStr(IOStatus));
       exit;
     end;
@@ -857,7 +857,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.32  2004-04-29 21:41:44  peter
+  Revision 1.33  2004-05-02 09:31:52  peter
+    * remove failed_to_execute_ strings, use the failed_to_run
+
+  Revision 1.32  2004/04/29 21:41:44  peter
     * test result of execution and report as failure with iostatus displayed
 
   Revision 1.31  2004/04/01 12:51:32  olle

tests/utils/teststr.pp

@@ -27,8 +27,6 @@ const
   successfully_compiled = 'Successfully compiled ';
   failed_to_run = 'Failed to run ';
   successfully_run = 'Successfully run ';
-  failed_to_execute_compiler = 'Failed to execute compiler ';
-  failed_to_execute_test = 'Failed to execute test ';
   skipping_graph_test = 'Skipping test because it uses graph ';
   skipping_interactive_test = 'Skipping test because it is interactive ';
   skipping_known_bug = 'Skipping test because it is a known bug ';
@@ -49,7 +47,10 @@ end.
 
 {
   $Log$
-  Revision 1.6  2004-04-29 21:41:44  peter
+  Revision 1.7  2004-05-02 09:31:52  peter
+    * remove failed_to_execute_ strings, use the failed_to_run
+
+  Revision 1.6  2004/04/29 21:41:44  peter
     * test result of execution and report as failure with iostatus displayed
 
   Revision 1.5  2003/10/13 14:19:02  peter