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

AutoTest: Limit condition for test execution to Linux

Browse Source 
gcc and clang are handling builtin include paths differently.
On Linux the default should be gcc - which works fine even
if boost is installed in /usr/local.
On macOS clang is default which does have the correct builtin
include paths only for Qbs but we are testing on qmake as well.
So, expect the BOOST_INCLUDE_DIR set on macOS if we want to
have this test executed.

Change-Id: Ib9ad697b59bfad5413ad984c9b969ec8b174ae9a
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-06-18 10:59:25 +02:00
parent d1c226d70b
commit e6ede1d997
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/autotest/autotestunittests.cpp
View File

@@ -77,8 +77,9 @@ void AutoTestUnitTests::initTestCase()
if (!qgetenv("BOOST_INCLUDE_DIR").isEmpty()) { if (!qgetenv("BOOST_INCLUDE_DIR").isEmpty()) {
m_checkBoost = true; m_checkBoost = true;
} else { } else {
if (QFileInfo::exists("/usr/include/boost/version.hpp") if (Utils::HostOsInfo::isLinuxHost()
|| QFileInfo::exists("/usr/local/include/boost/version.hpp")) { && (QFileInfo::exists("/usr/include/boost/version.hpp")
|| QFileInfo::exists("/usr/local/include/boost/version.hpp"))) {
qDebug() << "Found boost at system level - will run boost parser test."; qDebug() << "Found boost at system level - will run boost parser test.";
m_checkBoost = true; m_checkBoost = true;
} }