1 files changed, 35 insertions, 0 deletions
diff --git a/tests/auto/blackbox/tst_blackboxbaremetal.cpp b/tests/auto/blackbox/tst_blackboxbaremetal.cpp
index 41f50a0ed..d32abf82a 100644
--- a/tests/auto/blackbox/tst_blackboxbaremetal.cpp
+++ b/tests/auto/blackbox/tst_blackboxbaremetal.cpp
@@ -32,6 +32,7 @@
 
 #include "../shared.h"
 
+#include <QtCore/qdir.h>
 #include <QtCore/qregularexpression.h>
 
 static bool extractToolset(const QByteArray &output,
@@ -47,6 +48,17 @@ static bool extractToolset(const QByteArray &output,
     return true;
 }
 
+static bool extractCompilerIncludePaths(const QByteArray &output, QStringList &compilerIncludePaths)
+{
+    const QRegularExpression re("%%([^%%]+)%%");
+    QRegularExpressionMatchIterator it = re.globalMatch(output);
+    if (!it.hasNext())
+        return false;
+    const QRegularExpressionMatch match = it.next();
+    compilerIncludePaths = match.captured(1).split(",");
+    return true;
+}
+
 static QByteArray unsupportedToolsetMessage(const QByteArray &output)
 {
     QByteArray toolchain;
@@ -142,6 +154,22 @@ void TestBlackboxBareMetal::distributionIncludePaths()
     QCOMPARE(runQbs(), 0);
 }
 
+void TestBlackboxBareMetal::compilerIncludePaths()
+{
+    QDir::setCurrent(testDataDir + "/compiler-include-paths");
+    QCOMPARE(runQbs(QbsRunParameters("resolve", QStringList("-n"))), 0);
+    if (!m_qbsStdout.contains("compilerIncludePaths:"))
+        QFAIL("No compiler include paths exists");
+
+    QStringList includePaths;
+    QVERIFY(extractCompilerIncludePaths(m_qbsStdout, includePaths));
+    QVERIFY(includePaths.count() > 0);
+    for (const auto &includePath : includePaths) {
+        const QDir dir(includePath);
+        QVERIFY(dir.exists());
+    }
+}
+
 void TestBlackboxBareMetal::preincludeHeaders()
 {
     QDir::setCurrent(testDataDir + "/preinclude-headers");
@@ -216,4 +244,11 @@ void TestBlackboxBareMetal::linkerMapFile()
     QCOMPARE(regularFileExists(linkerMap), generateMap);
 }
 
+void TestBlackboxBareMetal::compilerDefinesByLanguage()
+{
+    QDir::setCurrent(testDataDir + "/compiler-defines-by-language");
+    QbsRunParameters params(QStringList{ "-f", "compiler-defines-by-language.qbs" });
+    QCOMPARE(runQbs(params), 0);
+}
+
 QTEST_MAIN(TestBlackboxBareMetal)