whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testlib: Allow tailing comments in blacklist files 

Task-number: QTBUG-61987
Change-Id: I27219a6d06d7a81514e3f7b2ad5469676f724e04
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
bb10
Tor Arne Vestbø 2017-07-18 14:58:31 +02:00
parent c08dc1e04f
commit 4a7ec2d9b0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/testlib/qtestblacklist.cpp
View File

@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
/*
The BLACKLIST file format is a grouped listing of keywords.
Blank lines and lines starting with # are simply ignored. An initial #-line
Blank lines and everything after # is simply ignored. An initial #-line
referring to this documentation is kind to readers. Comments can also be used
to indicate the reasons for ignoring particular cases.
@ -247,8 +247,12 @@ void parseBlackList()
QByteArray function;
while (!ignored.atEnd()) {
QByteArray line = ignored.readLine().simplified();
if (line.isEmpty() || line.startsWith('#'))
QByteArray line = ignored.readLine();
const int commentPosition = line.indexOf('#');
if (commentPosition >= 0)
line.truncate(commentPosition);
line = line.simplified();
if (line.isEmpty())
continue;
if (line.startsWith('[')) {
function = line.mid(1, line.length() - 2);