Browse Source

Consider a 'Compilation raised exception internally' without Fatal nor Error message as an InternalError

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

+ 8 - 1
tests/utils/dotest.pp

@@ -835,6 +835,7 @@ function ExitWithInternalError(const OutName:string):boolean;
 var
   t : text;
   s : string;
+  error_or_fatal_seen : boolean;
 begin
   ExitWithInternalError:=false;
   { open logfile }
@@ -844,14 +845,20 @@ begin
   {$I+}
   if ioresult<>0 then
    exit;
+  error_or_fatal_seen:=false;
   while not eof(t) do
    begin
      readln(t,s);
-     if pos('Fatal: Internal error ',s)>0 then
+     if (pos('Fatal: Internal error ',s)>0) or
+        ((pos('Error: Compilation raised exception internally',s)>0)
+         and not error_or_fatal_seen) then
       begin
         ExitWithInternalError:=true;
         break;
       end;
+     if (pos('Error:',s)>0) or
+        (pos('Error:',s)>0) then
+       error_or_fatal_seen:=true;
    end;
   close(t);
 end;