Browse Source

Add TU_COMPILERDATE to ShowRunData

git-svn-id: trunk@26205 -
pierre 11 years ago
parent
commit
cf175b28d1
1 changed files with 23 additions and 16 deletions
  1. 23 16
      tests/utils/testsuite/utests.pp

+ 23 - 16
tests/utils/testsuite/utests.pp

@@ -4,23 +4,8 @@ unit utests;
 
 
 interface
 interface
 
 
-{$ifdef FPC}
-  {$ifdef VER2_4}
-    {$define USE_FPCGI}
-  {$endif VER2_4}
-  {$ifdef VER2_5}
-    {$define USE_FPCGI}
-  {$endif VER2_5}
-{$endif FPC}
-
-{$undef USE_FPCGI}
-
 uses
 uses
-{$ifdef USE_FPCGI}
-     fpcgi,
-{$else not USE_FPCGI}
      cgiapp,
      cgiapp,
-{$endif not USE_FPCGI}
      sysutils,mysql55conn,sqldb,whtml,dbwhtml,db,
      sysutils,mysql55conn,sqldb,whtml,dbwhtml,db,
      tresults,
      tresults,
      Classes,ftFont,fpimage,fpimgcanv,fpWritePng,fpcanvas;
      Classes,ftFont,fpimage,fpimgcanv,fpWritePng,fpcanvas;
@@ -114,6 +99,9 @@ Type
 implementation
 implementation
 
 
 
 
+  uses
+    dateutils;
+
 Const
 Const
 {$i utests.cfg}
 {$i utests.cfg}
 
 
@@ -582,7 +570,7 @@ begin
     EmitResetButton('','Reset form');
     EmitResetButton('','Reset form');
     FormEnd;
     FormEnd;
     end;
     end;
-  ShowRunOverview;
+//  ShowRunOverview;
 end;
 end;
 
 
 Procedure TTestSuite.EmitHistoryForm;
 Procedure TTestSuite.EmitHistoryForm;
@@ -934,6 +922,7 @@ Const
   SGetRunData = 'SELECT TU_ID,TU_DATE,TC_NAME,TO_NAME,' +
   SGetRunData = 'SELECT TU_ID,TU_DATE,TC_NAME,TO_NAME,' +
                 'TU_SUBMITTER,TU_MACHINE,TU_COMMENT,TV_VERSION,'+
                 'TU_SUBMITTER,TU_MACHINE,TU_COMMENT,TV_VERSION,'+
                 'TU_CATEGORY_FK,TU_SVNCOMPILERREVISION,TU_SVNRTLREVISION,'+
                 'TU_CATEGORY_FK,TU_SVNCOMPILERREVISION,TU_SVNRTLREVISION,'+
+                'TU_COMPILERDATE,'+
                 'TU_SVNPACKAGESREVISION,TU_SVNTESTSREVISION,'+
                 'TU_SVNPACKAGESREVISION,TU_SVNTESTSREVISION,'+
                '(TU_SUCCESSFULLYFAILED+TU_SUCCESFULLYCOMPILED+TU_SUCCESSFULLYRUN) AS OK,'+
                '(TU_SUCCESSFULLYFAILED+TU_SUCCESFULLYCOMPILED+TU_SUCCESSFULLYRUN) AS OK,'+
                '(TU_FAILEDTOCOMPILE+TU_FAILEDTORUN+TU_FAILEDTOFAIL) as Failed,'+
                '(TU_FAILEDTOCOMPILE+TU_FAILEDTORUN+TU_FAILEDTOFAIL) as Failed,'+
@@ -953,6 +942,7 @@ Var
   F : TField;
   F : TField;
   SC : string;
   SC : string;
   Date1, Date2: TDateTime;
   Date1, Date2: TDateTime;
+  CompilerDate1, CompilerDate2: TDateTime;
 begin
 begin
   Result:=(FRunID<>'');
   Result:=(FRunID<>'');
   If Result then
   If Result then
@@ -1090,12 +1080,28 @@ begin
               F := Q1.FieldByName('TU_DATE');
               F := Q1.FieldByName('TU_DATE');
               Date1 := F.AsDateTime;
               Date1 := F.AsDateTime;
               Write(F.AsString);
               Write(F.AsString);
+              F := Q1.FieldByName('TU_COMPILERDATE');
+              Try
+                CompilerDate1 := F.AsDateTime;
+                if not SameDate(Date1,CompilerDate1) then
+                  Write(' <> '+F.AsString);
+              Except
+                { Not a valid date, do nothing }
+              end;
             CellNext;
             CellNext;
               if Q2 <> nil then
               if Q2 <> nil then
                 begin
                 begin
                 F := Q2.FieldByName('TU_DATE');
                 F := Q2.FieldByName('TU_DATE');
                 Date2 := F.AsDateTime;
                 Date2 := F.AsDateTime;
                 Write(F.AsString);
                 Write(F.AsString);
+                F := Q2.FieldByName('TU_COMPILERDATE');
+                Try
+                  CompilerDate2 := F.AsDateTime;
+                  if not SameDate(Date2,CompilerDate2) then
+                    Write(' <> '+F.AsString);
+                Except
+                  { Not a valid date, do nothing }
+                end;
                 end;
                 end;
             CellEnd;
             CellEnd;
           RowEnd;
           RowEnd;
@@ -2701,4 +2707,5 @@ begin
     TestsuiteCGIURL:=TestsuiteURLPrefix+'cgi-bin/'+TestsuiteBin;
     TestsuiteCGIURL:=TestsuiteURLPrefix+'cgi-bin/'+TestsuiteBin;
 
 
   SDetailsURL := TestsuiteCGIURL + '?action=1&run1id=%s';
   SDetailsURL := TestsuiteCGIURL + '?action=1&run1id=%s';
+  ShortDateFormat:='yyyy/mm/dd';
 end.
 end.