AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtestblacklist: check against duplicating versioned distro

Browse Source 
Also check the version is non-empty.
Probably makes no difference, but it's obviously more correct.

Change-Id: I05eee5623ac432d2ea02f7aad874513beeb2ceeb
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
Edward Welbourne 2016-05-24 16:16:56 +02:00 committed by Edward Welbourne
parent 832715a679
commit 6f59926e67
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/testlib/qtestblacklist.cpp
View File

@ -144,7 +144,11 @@ static QSet<QByteArray> activeConditions()
if (!distributionName.isEmpty()) { if (!distributionName.isEmpty()) {
if (result.find(distributionName) == result.end()) if (result.find(distributionName) == result.end())
result.insert(distributionName); result.insert(distributionName);
result.insert(distributionName + "-" + distributionRelease); if (!distributionRelease.isEmpty()) {
QByteArray versioned = distributionName + "-" + distributionRelease;
if (result.find(versioned) == result.end())
result.insert(versioned);
}
} }
return result; return result;