testresults: proctestsuitediff supports widget and lazarus version

git-svn-id: trunk@16123 -
This commit is contained in:
vincents 2008-08-18 14:15:53 +00:00
parent 1752c2e410
commit 2e4eb3f791
3 changed files with 77 additions and 13 deletions

View File

@ -16,13 +16,15 @@ From: "Lazarus Testsuite Diff Cron" <vincents@freepascal.org>
To: "Lazarus Developer List" <vincents@freepascal.org>
EOF
mysql -vvv -u ${USERNAME} --password=${PASSWORD} laz_testsuite -e '
SELECT (TU_FAILURECOUNT+TU_ERRORCOUNT) as FAILS,DATE(TU_DATE) as DATE,TESTFPCVERSION.TFV_VERSION as FPCVERSION,
TESTCPU.TC_NAME as CPU,TESTOS.TO_NAME as OS, TESTWIDGETSET.TW_NAME as WIDGETSET, TESTOS.TO_NAME as OS,
mysql -vvv -u ${USERNAME} --password=${PASSWORD} ${DATABASE} -e '
SELECT (TU_FAILURECOUNT+TU_ERRORCOUNT) as FAILS,DATE(TU_DATE) as DATE,
TESTLAZVERSION.TLV_VERSION as LAZVERSION, TESTFPCVERSION.TFV_VERSION as FPCVERSION,
TESTCPU.TC_NAME as CPU,TESTOS.TO_NAME as OS, TESTWIDGETSET.TW_NAME as WIDGETSET,
TU_SUBMITTER as TESTER,TU_MACHINE as MACHINE,TU_COMMENT as COMMENT, TIME(TU_DATE) as TIME, TU_ID, GROUP_CONCAT(TR_TEST_FK)
FROM TESTRUN LEFT JOIN (TESTCPU) ON (TU_CPU_FK=TC_ID) LEFT JOIN (TESTOS) ON (TU_OS_FK=TO_ID) LEFT JOIN (TESTFPCVERSION) ON (TU_FPC_VERSION_FK=TFV_ID)
FROM TESTRUN LEFT JOIN (TESTCPU) ON (TU_CPU_FK=TC_ID) LEFT JOIN (TESTOS) ON (TU_OS_FK=TO_ID) LEFT JOIN (TESTWIDGETSET) ON (TU_WS_FK=TW_ID)
LEFT JOIN (TESTFPCVERSION) ON (TU_FPC_VERSION_FK=TFV_ID) LEFT JOIN (TESTLAZVERSION) ON (TU_LAZ_VERSION_FK=TLV_ID)
LEFT JOIN TESTRESULTS ON (TR_TESTRUN_FK=TU_ID)
WHERE (DATE_SUB(CURDATE(), INTERVAL 2 DAY)<=DATE(TU_DATE)) AND TR_OK<>"+" AND TR_SKIP<>"+"
GROUP BY TU_ID
ORDER BY FPCVERSION, OS, CPU, TESTER, MACHINE, COMMENT, DATE;' | tee mysql-output | $PROCTESTSUITEDIFF >> tests_mail
ORDER BY LAZVERSION, FPCVERSION, OS, CPU, WIDGETSET, TESTER, MACHINE, COMMENT, DATE;' | tee mysql-output | $PROCTESTSUITEDIFF >> tests_mail
#/usr/sbin/sendmail -f ${MAILFROM} ${MAILTO} < tests_mail >/dev/null 2>&1

View File

@ -25,13 +25,13 @@
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local>
</RunParams>
<Units Count="2">
<Units Count="4">
<Unit0>
<Filename Value="proctestsuitediff.pp"/>
<IsPartOfProject Value="True"/>
<UnitName Value="proctestsuitediff"/>
<CursorPos X="77" Y="9"/>
<TopLine Value="1"/>
<CursorPos X="1" Y="210"/>
<TopLine Value="182"/>
<EditorIndex Value="0"/>
<UsageCount Value="20"/>
<Loaded Value="True"/>
@ -40,13 +40,31 @@
<Filename Value="createdb.sql"/>
<CursorPos X="65" Y="53"/>
<TopLine Value="49"/>
<EditorIndex Value="1"/>
<EditorIndex Value="3"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
<SyntaxHighlighter Value="SQL"/>
</Unit1>
<Unit2>
<Filename Value="..\..\tools\install\rpm\lazarus.spec.template"/>
<CursorPos X="28" Y="65"/>
<TopLine Value="47"/>
<EditorIndex Value="2"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
<SyntaxHighlighter Value="None"/>
</Unit2>
<Unit3>
<Filename Value="..\..\..\fpc\2.3\rtl\objpas\strutils.pp"/>
<UnitName Value="strutils"/>
<CursorPos X="18" Y="721"/>
<TopLine Value="721"/>
<EditorIndex Value="1"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit3>
</Units>
<JumpHistory Count="11" HistoryIndex="10">
<JumpHistory Count="22" HistoryIndex="21">
<Position1>
<Filename Value="proctestsuitediff.pp"/>
<Caret Line="1" Column="27" TopLine="1"/>
@ -91,6 +109,50 @@
<Filename Value="proctestsuitediff.pp"/>
<Caret Line="184" Column="37" TopLine="159"/>
</Position11>
<Position12>
<Filename Value="..\..\tools\install\rpm\lazarus.spec.template"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position12>
<Position13>
<Filename Value="..\..\tools\install\rpm\lazarus.spec.template"/>
<Caret Line="87" Column="26" TopLine="58"/>
</Position13>
<Position14>
<Filename Value="..\..\tools\install\rpm\lazarus.spec.template"/>
<Caret Line="66" Column="39" TopLine="47"/>
</Position14>
<Position15>
<Filename Value="..\..\tools\install\rpm\lazarus.spec.template"/>
<Caret Line="87" Column="26" TopLine="58"/>
</Position15>
<Position16>
<Filename Value="proctestsuitediff.pp"/>
<Caret Line="57" Column="150" TopLine="37"/>
</Position16>
<Position17>
<Filename Value="proctestsuitediff.pp"/>
<Caret Line="184" Column="23" TopLine="167"/>
</Position17>
<Position18>
<Filename Value="proctestsuitediff.pp"/>
<Caret Line="205" Column="21" TopLine="197"/>
</Position18>
<Position19>
<Filename Value="proctestsuitediff.pp"/>
<Caret Line="200" Column="24" TopLine="185"/>
</Position19>
<Position20>
<Filename Value="proctestsuitediff.pp"/>
<Caret Line="41" Column="21" TopLine="37"/>
</Position20>
<Position21>
<Filename Value="proctestsuitediff.pp"/>
<Caret Line="210" Column="19" TopLine="191"/>
</Position21>
<Position22>
<Filename Value="proctestsuitediff.pp"/>
<Caret Line="111" Column="15" TopLine="92"/>
</Position22>
</JumpHistory>
</ProjectOptions>
<CompilerOptions>

View File

@ -181,7 +181,7 @@ begin
yesterday := FormatDateTime('YYYY-mm-dd', todaydate-1);
today := FormatDateTime('YYYY-mm-dd', todaydate);
lenfailstr := 5; { Length('FAILS') = column header }
dataend := findseparator(datastart, 6);
dataend := findseparator(datastart, 8);
datalen := dataend - datastart + 1;
{ cut time (last 2 fields, ' HH:MM:SS | XXXX |') }
houroffset := dataend + 2;
@ -205,8 +205,8 @@ begin
dbfailsep := posex('|', curr.line, failoffset);
curr.dbfail := copy(curr.line, failoffset, dbfailsep-failoffset);
curr.failset := trim(copy(curr.line, dbfailsep+1, failend-2-dbfailsep));
if curr.dbfail <> curr.fail then
curr.fail := curr.fail + ' (' + curr.dbfail + ')';
//if curr.dbfail <> curr.fail then
//curr.fail := curr.fail + ' (' + curr.dbfail + ')';
end else
if length(footer) = 0 then
footer := curr.line;