Michaël Van Canneyt 5 месяцев назад
Родитель
Сommit
59ed4c9228
2 измененных файлов с 6 добавлено и 3 удалено
  1. 4 1
      tests/utils/testsuite/tshttp.pp
  2. 2 2
      tests/utils/testsuite/tssql.pas

+ 4 - 1
tests/utils/testsuite/tshttp.pp

@@ -7,7 +7,7 @@ unit tshttp;
 interface
 
 uses
-   classes, httpdefs, fphttp, cgiapp, fpcgi, custcgi, inifiles, types,  sysutils,
+   classes, httpdefs, fphttp, inifiles, types,  sysutils,
    sqldb, whtml, db, dbwhtml,
    tsgraph, tsdb, tssql, tshistory, tstypes, tsconsts, tsutils, tshtml;
 
@@ -264,10 +264,13 @@ begin
   FInfo.AllCategoryID:=FSQL.GetCategoryID('All');
   FInfo.AllOSID:=FSQL.GetOSID('All');
   FInfo.AllCPUID:=FSQL.GetCPUID('All');
+  FInfo.AllVersionID:=FSQL.GetVersionID('All');
   if FVars.OSID <= 0 then
     FVars.OSID:=FInfo.AllOSID;
   if FVars.CPUID<=0 then
     FVars.CPUID:=FInfo.AllCPUID;
+  if FVars.VersionID<=0 then
+    FVars.VersionID:=FInfo.AllVersionID;
 end;
 
 

+ 2 - 2
tests/utils/testsuite/tssql.pas

@@ -305,7 +305,7 @@ end;
 function TTestSuiteSQL.GetRunOverviewSQL: String;
 
 Const
-  SOverview = 'SELECT TU_ID as ID,TU_DATE as Date,TC_NAME as CPU,TO_NAME as OS,'+
+  SOverview = 'SELECT TU_ID as ID,TU_DATE as Date,TC_NAME as CPU, TO_NAME as OS,'+
                'TV_VERSION as Version, '+
                '(select count(*) from testresults where (TR_TESTRUN_FK=TU_ID)) as Count,'+
                'TU_COMPILERREVISION as CompRev,'+
@@ -334,7 +334,7 @@ begin
    S:='';
    S:=S+PointerIs('TP_CPU_FK',FVars.CPUID,FInfo.AllCPUID);
    S:=S+PointerIs('TP_CATEGORY_FK',FVars.CategoryID,FInfo.AllCategoryID);
-   S:=S+PointerIs('TP_VERSION_FK',FVars.VersionID);
+   S:=S+PointerIs('TP_VERSION_FK',FVars.VersionID,FInfo.AllVersionID);
    S:=S+PointerIs('TP_OS_FK',FVars.OSID,FInfo.ALLOSID);
    If (Round(FVars.Date)<>0) then
      S:=S+Format(' AND (TU_DATE=''%s'')',[FormatDateTime('YYYY-MM-DD',FVars.Date)]);