paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-10 05:25:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ %Note= comment added

Browse Source
This commit is contained in:
pierre 2001-07-31 09:00:16 +00:00
parent be8a646ebb
commit 9a85e28526
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/utils/dotest.pp
View File

@ -37,6 +37,7 @@ var
CompilerVersion : string; CompilerVersion : string;
PPFile : string; PPFile : string;
TestName : string; TestName : string;
Note : string;
const const
ResLogfile : string[32] = 'log'; ResLogfile : string[32] = 'log';
@ -269,6 +270,7 @@ begin
Verbose(V_Error,'Can''t open '+fn); Verbose(V_Error,'Can''t open '+fn);
exit; exit;
end; end;
Note:='';
while not eof(t) do while not eof(t) do
begin begin
readln(t,s); readln(t,s);
@ -310,6 +312,12 @@ begin
else else
if GetEntry('INTERACTIVE') then if GetEntry('INTERACTIVE') then
r.IsInteractive:=true r.IsInteractive:=true
else
if GetEntry('NOTE') then
begin
Note:='Note: '+res;
Verbose(V_Normal,Note);
end
else else
Verbose(V_Error,'Unknown entry: '+s); Verbose(V_Error,'Unknown entry: '+s);
end; end;
@ -381,7 +389,8 @@ begin
args:=args+' '+Config.NeedOptions; args:=args+' '+Config.NeedOptions;
args:=args+' '+ppfile; args:=args+' '+ppfile;
Verbose(V_Debug,'Executing '+compilerbin+' '+args); Verbose(V_Debug,'Executing '+compilerbin+' '+args);
ExecuteRedir(CompilerBin,args,'',OutName,''); { also get the output from as and ld that writes to stderr sometimes }
ExecuteRedir(CompilerBin,args,'',OutName,OutName);
Verbose(V_Debug,'Exitcode '+ToStr(ExecuteResult)); Verbose(V_Debug,'Exitcode '+ToStr(ExecuteResult));
{ Shoud the compile fail ? } { Shoud the compile fail ? }
if Config.ShouldFail then if Config.ShouldFail then
@ -394,9 +403,13 @@ begin
else else
begin begin
AddLog(FailLogFile,TestName); AddLog(FailLogFile,TestName);
if Note<>'' then
AddLog(FailLogFile,Note);
AddLog(ResLogFile,'Failed, compilation successfull '+PPFile); AddLog(ResLogFile,'Failed, compilation successfull '+PPFile);
AddLog(LongLogFile,'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>'); AddLog(LongLogFile,'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>');
AddLog(LongLogFile,'Failed, compilation successfull '+PPFile); AddLog(LongLogFile,'Failed, compilation successfull '+PPFile);
if Note<>'' then
AddLog(LongLogFile,Note);
CopyFile(OutName,LongLogFile,true); CopyFile(OutName,LongLogFile,true);
end; end;
end end
@ -405,9 +418,13 @@ begin
if ExecuteResult<>0 then if ExecuteResult<>0 then
begin begin
AddLog(FailLogFile,TestName); AddLog(FailLogFile,TestName);
if Note<>'' then
AddLog(FailLogFile,Note);
AddLog(ResLogFile,'Failed to compile '+PPFile); AddLog(ResLogFile,'Failed to compile '+PPFile);
AddLog(LongLogFile,'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>'); AddLog(LongLogFile,'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>');
AddLog(LongLogFile,'Failed to compile '+PPFile); AddLog(LongLogFile,'Failed to compile '+PPFile);
if Note<>'' then
AddLog(LongLogFile,Note);
CopyFile(OutName,LongLogFile,true); CopyFile(OutName,LongLogFile,true);
Verbose(V_Abort,'Exitcode: '+ToStr(ExecuteResult)+' (expected 0)'); Verbose(V_Abort,'Exitcode: '+ToStr(ExecuteResult)+' (expected 0)');
end end
@ -464,7 +481,7 @@ var
writeln(' -E execute test also'); writeln(' -E execute test also');
writeln(' -A include ALL tests'); writeln(' -A include ALL tests');
writeln(' -G include graph tests'); writeln(' -G include graph tests');
writeln(' -G include known bug tests'); writeln(' -K include known bug tests');
writeln(' -I include interactive tests'); writeln(' -I include interactive tests');
halt(1); halt(1);
end; end;
@ -604,7 +621,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.9 2001-07-04 11:23:39 florian Revision 1.10 2001-07-31 09:00:16 pierre
+ %Note= comment added
Revision 1.9 2001/07/04 11:23:39 florian
* spelling mistake fixed * spelling mistake fixed
Revision 1.8 2001/06/02 00:41:36 peter Revision 1.8 2001/06/02 00:41:36 peter