diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-14 12:23:58 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-14 11:27:30 +0000 |
| commit | 4e9c3ce75825e2b841c37d1ae16e8294edb3f69b (patch) | |
| tree | 505110c7e395200d99575f7a911b0ef684a434f0 | |
| parent | 3512a8cd5a2be336f610ec2334185e525af46b65 (diff) | |
Fix TestBlackbox::maximumCxxLanguageVersion()
Some of our test machines have older compilers, so also check for the
deprecated command-line options.
Change-Id: I589c29faf3cafd6bd22e975e3d80ea4f24e39507
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 826884f08..b6bf0eb84 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -5563,12 +5563,13 @@ void TestBlackbox::maximumCxxLanguageVersion() { QDir::setCurrent(testDataDir + "/maximum-cxx-language-version"); QCOMPARE(runQbs(QStringList({"--command-echo-mode", "command-line"})), 0); - QVERIFY2(m_qbsStdout.contains("c++17") || m_qbsStdout.contains("c++latest"), - m_qbsStdout.constData()); + 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); - QVERIFY2(m_qbsStdout.contains("c++14"), m_qbsStdout.constData()); + QVERIFY2(m_qbsStdout.contains("c++14") || m_qbsStdout.contains("c++1y"), + m_qbsStdout.constData()); } void TestBlackbox::minimumSystemVersion() |