+ Added support for compiler version

tests/utils/dbdigest.pp

@@ -168,6 +168,7 @@ TConfigOpt = (
   coLogFile,
   coOS,
   coCPU,
+  coVersion,
   coDate
  );
 
@@ -181,15 +182,17 @@ ConfigStrings : Array [TConfigOpt] of string = (
   'logfile',
   'os',
   'cpu',
+  'version',
   'date'
 );
 
 ConfigOpts : Array[TConfigOpt] of char 
-           = ('d','h','u','p','l','o','c','t');
+           = ('d','h','u','p','l','o','c','v','t');
 
 Var
   TestOS,
   TestCPU,
+  TestVersion,
   DatabaseName,
   HostName,
   UserName,
@@ -208,6 +211,7 @@ begin
     coLogFile      : LogFileName:=Value;
     coOS           : TestOS:=Value;
     coCPU          : TestCPU:=Value; 
+    coVersion      : TestVersion:=Value;
     coDate         : TestDate:=StrToDate(Value);
   end;
 end;
@@ -319,6 +323,7 @@ end;
 Var
   TestCPUID : Integer;
   TestOSID  : Integer;
+  TestVersionID  : Integer;
 
 Procedure GetIDs;
 
@@ -329,6 +334,9 @@ begin
   TestOSID  := GetOSID(TestOS);
   If TestOSID=-1 then
     Verbose(V_Error,'NO ID for OS "'+TestOS+'" found.');
+  TestVersionID  := GetVersionID(TestVersion);
+  If TestVersionID=-1 then
+    Verbose(V_Error,'NO ID for version "'+TestVersion+'" found.');
   If (Round(TestDate)=0) then 
     Testdate:=Date;
 end;
@@ -374,7 +382,7 @@ begin
             TestLog:=GetLog(Line)
           else
             TestLog:='';  
-          AddTestResult(ID,TestOSID,TestCPUID,Ord(TS),
+          AddTestResult(ID,TestOSID,TestCPUID,TestVersionID,Ord(TS),
                         TestOK[TS],TestSkipped[TS],
                         TestLog,
                         TestDate);
@@ -403,7 +411,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2002-12-17 15:04:32  michael
+  Revision 1.2  2002-12-21 15:31:16  michael
+  + Added support for compiler version
+
+  Revision 1.1  2002/12/17 15:04:32  michael
   + Added dbdigest to store results in a database
 
   Revision 1.2  2002/11/18 16:42:43  pierre

tests/utils/dbtests.pp

@@ -15,9 +15,10 @@ Uses
 Function GetTestID(Name : string) : Integer; 
 Function GetOSID(Name : String) : Integer;
 Function GetCPUID(Name : String) : Integer;
+Function GetVersionID(Name : String) : Integer;
 Function AddTest(Name : String; AddSource : Boolean) : Integer;
 Function UpdateTest(ID : Integer; Info : TConfig; Source : String) : Boolean;
-Function AddTestResult(TestID,OSID,CPUID,TestRes : Integer; 
+Function AddTestResult(TestID,OSID,CPUID,VersionID,TestRes : Integer; 
                        OK, Skipped : Boolean;
                        Log : String;
                        TestDate : TDateTime) : Integer;
@@ -175,6 +176,15 @@ begin
   Result:=IDQuery(Format(SFromName,[Name]));
 end;
 
+Function GetVersionID(Name : String) : Integer;
+
+Const 
+  SFromName = 'SELECT TV_ID FROM TESTVERSION WHERE (TV_VERSION="%s")';
+
+begin
+  Result:=IDQuery(Format(SFromName,[Name]));
+end;
+
 Function GetCPUID(Name : String) : Integer;
 
 Const 
@@ -253,17 +263,17 @@ begin
   Result:=RunQuery(Qry,res)
 end;
 
-Function AddTestResult(TestID,OSID,CPUID,TestRes : Integer; 
+Function AddTestResult(TestID,OSID,CPUID,VersionID,TestRes : Integer; 
                        OK, Skipped : Boolean;
                        Log : String;
                        TestDate : TDateTime) : Integer;
 
 Const
   SInsertRes = 'Insert into TESTRESULTS ('+
-              ' TR_TEST_FK, TR_DATE, TR_CPU_FK, TR_OS_FK,'+
+              ' TR_TEST_FK, TR_DATE, TR_CPU_FK, TR_OS_FK,TR_VERSION_FK,'+
               ' TR_OK, TR_SKIP, TR_RESULT, TR_LOG)'+
               'VALUES ('+
-              ' %d,"%s",%d,%d,'+
+              ' %d,"%s",%d,%d,%d,'+
               ' "%s","%s",%d,"%s")';
 
 Var
@@ -272,7 +282,7 @@ Var
    
 begin
   Result:=-1;
-  Qry:=Format(SInsertRes,[TestID,FormatDateTime('yyyymmdd',TestDate),CPUID,OSID,
+  Qry:=Format(SInsertRes,[TestID,FormatDateTime('yyyymmdd',TestDate),CPUID,OSID,VersionID,
                          B[OK],B[Skipped],TestRes,EscapeSQL(Log)
                          ]);
   If RunQuery(Qry,Res) then