diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-14 14:21:59 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-14 12:39:41 +0000 |
| commit | a71e49cf5c1d1daec0097bb878ba4dc170cecc09 (patch) | |
| tree | dd0977f0cf43134ea4cc1a3e42b02a73044ee4a3 /tests | |
| parent | 4e9c3ce75825e2b841c37d1ae16e8294edb3f69b (diff) | |
Fix TestBlackbox::maximumCxxLanguageVersion() again
It turns out that the gcc versions on some of our test machines are so
old that they don't even know the deprecated "c++1z" value yet. So don't
require the compiler call to actually succeed.
Change-Id: I751223f073edbd207e078c2bb018cdea4cd95e64
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index b6bf0eb84..adfde898e 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -5562,12 +5562,14 @@ void TestBlackbox::makefileGenerator() void TestBlackbox::maximumCxxLanguageVersion() { QDir::setCurrent(testDataDir + "/maximum-cxx-language-version"); - QCOMPARE(runQbs(QStringList({"--command-echo-mode", "command-line"})), 0); + QCOMPARE(runQbs(QbsRunParameters("resolve", + QStringList("products.app.enableNewestModule:true"))), 0); + QCOMPARE(runQbs(QStringList({"--command-echo-mode", "command-line", "-n"})), 0); QVERIFY2(m_qbsStdout.contains("c++17") || m_qbsStdout.contains("c++1z") || m_qbsStdout.contains("c++latest"), m_qbsStdout.constData()); QCOMPARE(runQbs(QbsRunParameters("resolve", QStringList("products.app.enableNewestModule:false"))), 0); - QCOMPARE(runQbs(QStringList({"--command-echo-mode", "command-line"})), 0); + QCOMPARE(runQbs(QStringList({"--command-echo-mode", "command-line", "-n"})), 0); QVERIFY2(m_qbsStdout.contains("c++14") || m_qbsStdout.contains("c++1y"), m_qbsStdout.constData()); } |