diff options
| author | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2016-05-24 16:16:56 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-05-25 11:17:16 +0000 |
| commit | 6f59926e670d68b27a387651a466f47ca9e8fd37 (patch) | |
| tree | dca06967d8508d21c9eb1bf762c395925def18d6 /src/testlib | |
| parent | 832715a67908683241b8da524f6aa0c1a8a4267e (diff) | |
qtestblacklist: check against duplicating versioned distro
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>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index da98b88989..9300cb58af 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -144,7 +144,11 @@ static QSet<QByteArray> activeConditions() if (!distributionName.isEmpty()) { if (result.find(distributionName) == result.end()) 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; |