[TESTMAN] Don't count the reboot into 3rd stage twice and clarify that only *re*boots are counted.

That means, the first "Running stage 1" line is never counted and an ideal result would only report 2 reboots (into stage 2 and stage 3).
This gets the logic back to what we had in SVN times.

svn path=/trunk/; revision=1012
This commit is contained in:
Colin Finck 2017-10-29 10:30:55 +00:00
parent 967bbfb9cf
commit 012098ffda

View File

@ -77,12 +77,12 @@
if (feof($fp))
throw new ErrorMessageException("Found no Git revision in this log!");
// Find the first 3rd stage boot.
// Find the first 3rd stage boot and count all *re*boots happening in between.
while (!feof($fp))
{
$line = fgets($fp);
if (preg_match("#^\[SYSREG\] Running stage ([1-3])#", $line, $matches))
if (preg_match("#^\[SYSREG\] Running stage ([2-3])#", $line, $matches))
{
$perf["reboots"]++;
if ($matches[1] == "3")
@ -106,9 +106,6 @@
if (is_numeric($cycles[2]))
$perf["boot_cycles"] = $cycles[2];
// We're in the 3rd stage, increase the reboot count.
$perf["reboots"]++;
break;
}
}