paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-02 06:29:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

* digest updated for max version limit

Browse Source
This commit is contained in:
peter 2003-10-13 14:19:02 +00:00
parent 303b5252e4
commit 430d498e48
6 changed files with 59 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/utils/dbdigest.pp
View File

@ -37,6 +37,7 @@ Type
stSkippingInteractiveTest,
stSkippingKnownBug,
stSkippingCompilerVersionTooLow,
stSkippingCompilerVersionTooHigh,
stSkippingOtherCpu,
stSkippingOtherTarget,
stskippingRunUnit,
@ -60,6 +61,7 @@ Const
False, // stSkippingInteractiveTest,
False, // stSkippingKnownBug,
False, // stSkippingCompilerVersionTooLow,
False, // stSkippingCompilerVersionTooHigh,
False, // stSkippingOtherCpu,
False, // stSkippingOtherTarget,
False, // stskippingRunUnit,
@ -78,6 +80,7 @@ Const
True, // stSkippingInteractiveTest,
True, // stSkippingKnownBug,
True, // stSkippingCompilerVersionTooLow,
True, // stSkippingCompilerVersionTooHigh,
True, // stSkippingOtherCpu,
True, // stSkippingOtherTarget,
True, // stskippingRunUnit,
@ -96,6 +99,7 @@ Const
False, // stSkippingInteractiveTest,
False, // stSkippingKnownBug,
False, // stSkippingCompilerVersionTooLow,
False, // stSkippingCompilerVersionTooHigh,
False, // stSkippingOtherCpu,
False, // stSkippingOtherTarget,
False, // stskippingRunUnit,
@ -113,7 +117,8 @@ Const
skipping_graph_test ,
skipping_interactive_test ,
skipping_known_bug ,
skipping_compiler_version_too_low ,
skipping_compiler_version_too_low,
skipping_compiler_version_too_high,
skipping_other_cpu ,
skipping_other_target ,
skipping_run_unit ,
@ -422,7 +427,10 @@ end.
{
$Log$
Revision 1.7 2003-10-06 16:53:04 fpc
Revision 1.8 2003-10-13 14:19:02 peter
* digest updated for max version limit
Revision 1.7 2003/10/06 16:53:04 fpc
* allow digest programs on commandline
Revision 1.6 2003/10/04 21:30:21 florian

2
tests/utils/dbtests.pp
View File

@ -293,7 +293,7 @@ begin
Source:=', T_SOURCE="'+Source+'"';
end;
With Info do
Qry:=Format(SUpdateTest,[EscapeSQL(NeedCPU),'',EscapeSQL(NeedVersion),
Qry:=Format(SUpdateTest,[EscapeSQL(NeedCPU),'',EscapeSQL(MinVersion),
B[usesGraph],B[IsInteractive],ResultCode,
B[ShouldFail],B[NeedRecompile],B[NoRun],
B[NeedLibrary],KnownRunError,

17
tests/utils/digest.pp
View File

@ -32,7 +32,7 @@ const
skipping_graph_test_count : longint = 0;
skipping_interactive_test_count : longint = 0;
skipping_known_bug_count : longint = 0;
skipping_compiler_version_too_low_count : longint = 0;
skipping_other_version_count : longint = 0;
skipping_other_cpu_count : longint = 0;
skipping_other_target_count : longint = 0;
skipping_run_unit_count : longint = 0;
@ -106,7 +106,11 @@ begin
end
else if pos(skipping_compiler_version_too_low,st)=1 then
begin
inc(skipping_compiler_version_too_low_count);
inc(skipping_other_version_count);
end
else if pos(skipping_compiler_version_too_high,st)=1 then
begin
inc(skipping_other_version_count);
end
else if pos(skipping_other_cpu,st)=1 then
begin
@ -184,7 +188,7 @@ begin
number_skipped:= skipping_graph_test_count
+skipping_interactive_test_count
+skipping_known_bug_count
+skipping_compiler_version_too_low_count
+skipping_other_version_count
+skipping_other_cpu_count
+skipping_other_target_count;
{ don't count these ones ...
@ -194,7 +198,7 @@ begin
Writeln('Number of skipped graph tests = ',skipping_graph_test_count);
Writeln('Number of skipped interactive tests = ',skipping_interactive_test_count);
Writeln('Number of skipped known bug tests = ',skipping_known_bug_count);
Writeln('Number of skipped compiler version too low tests = ',skipping_compiler_version_too_low_count);
Writeln('Number of skipped tests for other versions = ',skipping_other_version_count);
Writeln('Number of skipped tests for other cpus = ',skipping_other_cpu_count);
Writeln('Number of skipped tests for other targets = ',skipping_other_target_count);
if unknown_lines>0 then
@ -235,7 +239,10 @@ end.
{
$Log$
Revision 1.3 2002-12-24 21:47:49 peter
Revision 1.4 2003-10-13 14:19:02 peter
* digest updated for max version limit
Revision 1.3 2002/12/24 21:47:49 peter
* NeedTarget, SkipTarget, SkipCPU added
* Retrieve compiler info in a single call for 1.1 compiler

30
tests/utils/dotest.pp
View File

@ -657,16 +657,33 @@ begin
if Res then
begin
if (Config.NeedVersion<>'') and not DoAll then
if (Config.MinVersion<>'') and not DoAll then
begin
Verbose(V_Debug,'Required compiler version: '+Config.NeedVersion);
Verbose(V_Debug,'Required compiler version: '+Config.MinVersion);
Res:=GetCompilerVersion;
if CompilerVersion<Config.NeedVersion then
if CompilerVersion<Config.MinVersion then
begin
{ avoid a second attempt by writing to elg file }
AddLog(OutName,skipping_compiler_version_too_low+PPFileInfo);
AddLog(ResLogFile,skipping_compiler_version_too_low+PPFileInfo);
Verbose(V_Abort,'Compiler version too low '+CompilerVersion+' < '+Config.NeedVersion);
Verbose(V_Abort,'Compiler version too low '+CompilerVersion+' < '+Config.MinVersion);
Res:=false;
end;
end;
end;
if Res then
begin
if (Config.MaxVersion<>'') and not DoAll then
begin
Verbose(V_Debug,'Highest compiler version: '+Config.MaxVersion);
Res:=GetCompilerVersion;
if CompilerVersion>Config.MaxVersion then
begin
{ avoid a second attempt by writing to elg file }
AddLog(OutName,skipping_compiler_version_too_high+PPFileInfo);
AddLog(ResLogFile,skipping_compiler_version_too_high+PPFileInfo);
Verbose(V_Abort,'Compiler version too high '+CompilerVersion+' > '+Config.MaxVersion);
Res:=false;
end;
end;
@ -782,7 +799,10 @@ begin
end.
{
$Log$
Revision 1.27 2003-06-13 08:16:34 pierre
Revision 1.28 2003-10-13 14:19:02 peter
* digest updated for max version limit
Revision 1.27 2003/06/13 08:16:34 pierre
* fix a problem with KNOWNCOMPILE10ERROR
Revision 1.26 2003/02/20 12:41:15 pierre

6
tests/utils/teststr.pp
View File

@ -31,6 +31,7 @@ const
skipping_interactive_test = 'Skipping test because it is interactive ';
skipping_known_bug = 'Skipping test because it is a known bug ';
skipping_compiler_version_too_low = 'Skipping test because compiler version too low ';
skipping_compiler_version_too_high = 'Skipping test because compiler version too high ';
skipping_other_cpu = 'Skipping test because for other cpu ';
skipping_other_target = 'Skipping test because for other target ';
skipping_run_unit = 'Skipping test run because it is a unit ';
@ -46,7 +47,10 @@ end.
{
$Log$
Revision 1.4 2002-12-24 21:47:49 peter
Revision 1.5 2003-10-13 14:19:02 peter
* digest updated for max version limit
Revision 1.4 2002/12/24 21:47:49 peter
* NeedTarget, SkipTarget, SkipCPU added
* Retrieve compiler info in a single call for 1.1 compiler

8
tests/utils/testu.pp
View File

@ -18,7 +18,8 @@ type
SkipCPU,
NeedTarget,
SkipTarget,
NeedVersion,
MinVersion,
MaxVersion,
KnownRunNote,
KnownCompileNote,
KnownCompile10Note : string;
@ -180,7 +181,10 @@ begin
r.SkipCPU:=res
else
if GetEntry('VERSION') then
r.NeedVersion:=res
r.MinVersion:=res
else
if GetEntry('MAXVERSION') then
r.MaxVersion:=res
else
if GetEntry('RESULT') then
Val(res,r.ResultCode,code)