Browse Source

* fixed compile

peter 22 years ago
parent
commit
853c78c4b6
1 changed files with 39 additions and 39 deletions
  1. 39 39
      tests/utils/dbtests.pp

+ 39 - 39
tests/utils/dbtests.pp

@@ -3,16 +3,16 @@
 
 
 unit dbtests;
 unit dbtests;
 
 
-Interface 
+Interface
 
 
-Uses 
+Uses
   mysql,testu;
   mysql,testu;
 
 
 { ---------------------------------------------------------------------
 { ---------------------------------------------------------------------
-  High-level access  
+  High-level access
   ---------------------------------------------------------------------}
   ---------------------------------------------------------------------}
 
 
-Function GetTestID(Name : string) : Integer; 
+Function GetTestID(Name : string) : Integer;
 Function GetOSID(Name : String) : Integer;
 Function GetOSID(Name : String) : Integer;
 Function GetCPUID(Name : String) : Integer;
 Function GetCPUID(Name : String) : Integer;
 Function GetVersionID(Name : String) : Integer;
 Function GetVersionID(Name : String) : Integer;
@@ -20,7 +20,7 @@ Function GetRunID(OSID, CPUID, VERSIONID : Integer; Date : TDateTime) : Integer;
 Function AddRun(OSID, CPUID, VERSIONID : Integer; Date : TDateTime) : Integer;
 Function AddRun(OSID, CPUID, VERSIONID : Integer; Date : TDateTime) : Integer;
 Function AddTest(Name : String; AddSource : Boolean) : Integer;
 Function AddTest(Name : String; AddSource : Boolean) : Integer;
 Function UpdateTest(ID : Integer; Info : TConfig; Source : String) : Boolean;
 Function UpdateTest(ID : Integer; Info : TConfig; Source : String) : Boolean;
-Function AddTestResult(TestID,RunID,TestRes : Integer; 
+Function AddTestResult(TestID,RunID,TestRes : Integer;
                        OK, Skipped : Boolean;
                        OK, Skipped : Boolean;
                        Log : String) : Integer;
                        Log : String) : Integer;
 Function RequireTestID(Name : String): Integer;
 Function RequireTestID(Name : String): Integer;
@@ -29,7 +29,7 @@ Function CleanTestRun(ID : Integer) : Boolean;
 { ---------------------------------------------------------------------
 { ---------------------------------------------------------------------
     Low-level DB access.
     Low-level DB access.
   ---------------------------------------------------------------------}
   ---------------------------------------------------------------------}
- 
+
 
 
 Type
 Type
   TQueryResult = PMYSQL_RES;
   TQueryResult = PMYSQL_RES;
@@ -45,7 +45,7 @@ Function SQLDate(D : TDateTime) : String;
 
 
 Implementation
 Implementation
 
 
-Uses 
+Uses
   SysUtils;
   SysUtils;
 
 
 { ---------------------------------------------------------------------
 { ---------------------------------------------------------------------
@@ -55,17 +55,17 @@ Uses
 
 
 Var
 Var
   Connection : TMYSQL;
   Connection : TMYSQL;
-    
+
 
 
 Function ConnectToDatabase(DatabaseName,Host,User,Password : String) : Boolean;
 Function ConnectToDatabase(DatabaseName,Host,User,Password : String) : Boolean;
 
 
-Var 
+Var
   S : String;
   S : String;
 
 
 begin
 begin
   Verbose(V_DEBUG,'Connection params : '+DatabaseName+' '+Host+' '+User+' '+Password);
   Verbose(V_DEBUG,'Connection params : '+DatabaseName+' '+Host+' '+User+' '+Password);
   Result:=mysql_connect(@Connection,PChar(Host),PChar(User),PChar(Password))<>Nil;
   Result:=mysql_connect(@Connection,PChar(Host),PChar(User),PChar(Password))<>Nil;
-  If Not Result then 
+  If Not Result then
     begin
     begin
     S:=Strpas(mysql_error(@connection));
     S:=Strpas(mysql_error(@connection));
     Verbose(V_ERROR,'Failed to connect to database : '+S);
     Verbose(V_ERROR,'Failed to connect to database : '+S);
@@ -79,7 +79,7 @@ begin
       DisconnectDatabase;
       DisconnectDatabase;
       Verbose(V_Error,'Failed to select database : '+S);
       Verbose(V_Error,'Failed to select database : '+S);
       end;
       end;
-    end;  
+    end;
 end;
 end;
 
 
 Procedure DisconnectDatabase;
 Procedure DisconnectDatabase;
@@ -107,15 +107,15 @@ Var
 begin
 begin
   if Res=Nil then
   if Res=Nil then
     Result:=''
     Result:=''
-  else  
+  else
     begin
     begin
     Row:=mysql_fetch_row(Res);
     Row:=mysql_fetch_row(Res);
     If (Row=Nil) or (Row[ID]=Nil) then
     If (Row=Nil) or (Row[ID]=Nil) then
       Result:=''
       Result:=''
-    else  
-      Result:=strpas(Row[ID]); 
+    else
+      Result:=strpas(Row[ID]);
     end;
     end;
-  Verbose(V_DEBUG,'Field value '+Result);  
+  Verbose(V_DEBUG,'Field value '+Result);
 end;
 end;
 
 
 Procedure FreeQueryResult (Res : TQueryResult);
 Procedure FreeQueryResult (Res : TQueryResult);
@@ -136,7 +136,7 @@ begin
     Result:=StrToIntDef(GetResultField(Res,0),-1);
     Result:=StrToIntDef(GetResultField(Res,0),-1);
     FreeQueryResult(Res);
     FreeQueryResult(Res);
     end;
     end;
-end; 
+end;
 
 
 Function EscapeSQL( S : String) : String;
 Function EscapeSQL( S : String) : String;
 
 
@@ -154,16 +154,16 @@ begin
 end;
 end;
 
 
 { ---------------------------------------------------------------------
 { ---------------------------------------------------------------------
-  High-level access  
+  High-level access
   ---------------------------------------------------------------------}
   ---------------------------------------------------------------------}
- 
-  
-Function GetTestID(Name : string) : Integer; 
+
+
+Function GetTestID(Name : string) : Integer;
 
 
 Const
 Const
   SFromName = 'SELECT T_ID FROM TESTS WHERE (T_NAME="%s")';
   SFromName = 'SELECT T_ID FROM TESTS WHERE (T_NAME="%s")';
   SFromFullName = 'SELECT T_ID FROM TESTS WHERE (T_FULLNAME="%s")';
   SFromFullName = 'SELECT T_ID FROM TESTS WHERE (T_FULLNAME="%s")';
-  
+
 Var
 Var
   FN : String;
   FN : String;
 
 
@@ -176,7 +176,7 @@ end;
 
 
 Function GetOSID(Name : String) : Integer;
 Function GetOSID(Name : String) : Integer;
 
 
-Const 
+Const
   SFromName = 'SELECT TO_ID FROM TESTOS WHERE (TO_NAME="%s")';
   SFromName = 'SELECT TO_ID FROM TESTOS WHERE (TO_NAME="%s")';
 
 
 begin
 begin
@@ -185,7 +185,7 @@ end;
 
 
 Function GetVersionID(Name : String) : Integer;
 Function GetVersionID(Name : String) : Integer;
 
 
-Const 
+Const
   SFromName = 'SELECT TV_ID FROM TESTVERSION WHERE (TV_VERSION="%s")';
   SFromName = 'SELECT TV_ID FROM TESTVERSION WHERE (TV_VERSION="%s")';
 
 
 begin
 begin
@@ -194,7 +194,7 @@ end;
 
 
 Function GetCPUID(Name : String) : Integer;
 Function GetCPUID(Name : String) : Integer;
 
 
-Const 
+Const
   SFromName = 'SELECT TC_ID FROM TESTCPU WHERE (TC_NAME="%s")';
   SFromName = 'SELECT TC_ID FROM TESTCPU WHERE (TC_NAME="%s")';
 
 
 begin
 begin
@@ -205,24 +205,24 @@ end;
 Function GetRunID(OSID, CPUID, VERSIONID : Integer; Date : TDateTime) : Integer;
 Function GetRunID(OSID, CPUID, VERSIONID : Integer; Date : TDateTime) : Integer;
 
 
 
 
-Const 
+Const
   SFromIDS = 'SELECT TU_ID FROM TESTRUN WHERE '+
   SFromIDS = 'SELECT TU_ID FROM TESTRUN WHERE '+
              ' (TU_OS_FK=%d) '+
              ' (TU_OS_FK=%d) '+
              ' AND (TU_CPU_FK=%d) '+
              ' AND (TU_CPU_FK=%d) '+
              ' AND (TU_VERSION_FK=%d) '+
              ' AND (TU_VERSION_FK=%d) '+
              ' AND (TU_DATE="%s")';
              ' AND (TU_DATE="%s")';
-              
+
 begin
 begin
   Result:=IDQuery(Format(SFromIDS,[OSID,CPUID,VERSIONID,SQLDate(Date)]));
   Result:=IDQuery(Format(SFromIDS,[OSID,CPUID,VERSIONID,SQLDate(Date)]));
 end;
 end;
 
 
 Function AddRun(OSID, CPUID, VERSIONID : Integer; Date : TDateTime) : Integer;
 Function AddRun(OSID, CPUID, VERSIONID : Integer; Date : TDateTime) : Integer;
 
 
-Const 
+Const
   SInsertRun = 'INSERT INTO TESTRUN '+
   SInsertRun = 'INSERT INTO TESTRUN '+
                '(TU_OS_FK,TU_CPU_FK,TU_VERSION_FK,TU_DATE)'+
                '(TU_OS_FK,TU_CPU_FK,TU_VERSION_FK,TU_DATE)'+
                ' VALUES '+
                ' VALUES '+
-               '(%d,%d,%d,"%s")'; 
+               '(%d,%d,%d,"%s")';
 
 
 Var
 Var
   Res : TQueryResult;
   Res : TQueryResult;
@@ -231,20 +231,20 @@ begin
   If RunQuery(Format(SInsertRun,[OSID,CPUID,VERSIONID,SQLDate(Date)]),Res) then
   If RunQuery(Format(SInsertRun,[OSID,CPUID,VERSIONID,SQLDate(Date)]),Res) then
     Result:=mysql_insert_id(@connection)
     Result:=mysql_insert_id(@connection)
   else
   else
-    Result:=-1;  
+    Result:=-1;
 end;
 end;
 
 
 
 
 Function AddTest(Name : String; AddSource : Boolean) : Integer;
 Function AddTest(Name : String; AddSource : Boolean) : Integer;
 
 
-Const 
+Const
   SInsertTest = 'INSERT INTO TESTS (T_NAME,T_FULLNAME,T_ADDDATE)'+
   SInsertTest = 'INSERT INTO TESTS (T_NAME,T_FULLNAME,T_ADDDATE)'+
-                ' VALUES ("%s","%s",NOW())'; 
+                ' VALUES ("%s","%s",NOW())';
 
 
 Var
 Var
   Info : TConfig;
   Info : TConfig;
   Res  : TQueryResult;
   Res  : TQueryResult;
-    
+
 begin
 begin
   Result:=-1;
   Result:=-1;
   If FileExists(Name) and GetConfig(Name,Info) then
   If FileExists(Name) and GetConfig(Name,Info) then
@@ -258,10 +258,10 @@ begin
         If AddSource then
         If AddSource then
           UpdateTest(Result,Info,GetFileContents(Name))
           UpdateTest(Result,Info,GetFileContents(Name))
         else
         else
-          UpdateTest(Result,Info,'');  
+          UpdateTest(Result,Info,'');
       end
       end
     end
     end
-  else    
+  else
     Verbose(V_ERROR,'Could not find test "'+Name+'" or info about this test.');
     Verbose(V_ERROR,'Could not find test "'+Name+'" or info about this test.');
 end;
 end;
 
 
@@ -281,11 +281,11 @@ Const
                 'WHERE'+
                 'WHERE'+
                 ' T_ID=%d';
                 ' T_ID=%d';
 
 
- 
+
 Var
 Var
   Qry : String;
   Qry : String;
   Res : TQueryResult;
   Res : TQueryResult;
-      
+
 begin
 begin
   If Source<>'' then
   If Source<>'' then
     begin
     begin
@@ -297,14 +297,14 @@ begin
                              B[usesGraph],B[IsInteractive],ResultCode,
                              B[usesGraph],B[IsInteractive],ResultCode,
                              B[ShouldFail],B[NeedRecompile],B[NoRun],
                              B[ShouldFail],B[NeedRecompile],B[NoRun],
                              B[NeedLibrary],KnownRunError,
                              B[NeedLibrary],KnownRunError,
-                             B[IsKnown],EscapeSQL(Note),EscapeSQL(NeedOptions),
+                             B[IsKnownCompileError],EscapeSQL(Note),EscapeSQL(NeedOptions),
                              Source,
                              Source,
                              ID
                              ID
      ]);
      ]);
   Result:=RunQuery(Qry,res)
   Result:=RunQuery(Qry,res)
 end;
 end;
 
 
-Function AddTestResult(TestID,RunID,TestRes : Integer; 
+Function AddTestResult(TestID,RunID,TestRes : Integer;
                        OK, Skipped : Boolean;
                        OK, Skipped : Boolean;
                        Log : String) : Integer;
                        Log : String) : Integer;
 
 
@@ -317,7 +317,7 @@ Const
 Var
 Var
   Qry : String;
   Qry : String;
   Res : TQueryResult;
   Res : TQueryResult;
-   
+
 begin
 begin
   Result:=-1;
   Result:=-1;
   Qry:=Format(SInsertRes,
   Qry:=Format(SInsertRes,