feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

test2tasks.pl: Fix differing output format of testlib on Unix.

Browse Source 
Change-Id: I37fb39fa00e7e4a45ac843eba9f50d2d95a56ae1
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Friedemann Kleint
2011-12-09 11:02:54 +01:00
parent beede7d7cf
commit 9408ad93b3
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/test2tasks.pl
+14 -8
View File
@@ -39,18 +39,24 @@ my $lastLine = '';
while (my $line = <STDIN> ) {
chomp($line);
# --- Continuation line?
if (substr($line, 0, 1) eq ' ') {
if (substr($line, 0, 1) eq ' ' && index($line, 'Loc: [') < 0) {
$lastLine .= $line;
next;
}
# --- extract file name based matching '[..\].\tst_lancelot.cpp(258) : failure location'
if ($line =~ /^([^(]+)\((\d+)\) : failure location$/) {
my $slashPos = rindex($1, '/');
$slashPos = rindex($1, "\\") if $slashPos < 0;
my $fileName = $slashPos > 0 ? substr($1, $slashPos + 1) : $1;
# --- extract file name based matching:
# Windows: '[..\].\tst_lancelot.cpp(258) : failure location'
# Unix: ' Loc: [file(1596)]'
if ($line =~ /^([^(]+)\((\d+)\) : failure location$/
|| $line =~ /^\s*Loc:\s*\[([^(]+)\((\d+)\).*$/) {
my $fullFileName = $1;
my $line = $2;
my $fullFileName = $fileHash{$fileName};
$fullFileName = $fileName unless defined $fullFileName;
if (index($fullFileName, '/') != 0) { # Unix has absolute file names, Windows may not
my $slashPos = rindex($fullFileName, '/');
$slashPos = rindex($fullFileName, "\\") if $slashPos < 0;
my $fileName = $slashPos > 0 ? substr($1, $slashPos + 1) : $fullFileName;
$fullFileName = $fileHash{$fileName};
$fullFileName = $fileName unless defined $fullFileName;
}
my $type = index($lastLine, 'FAIL') == 0 ? 'err' : 'unknown';
print $fullFileName, "\t", $line, "\t", $type, "\t", $lastLine,"\n";
}