Merge 1.10 into master

Change-Id: Iecddc2722d22d7c15d4b32efd676fa8e7c00e99f

4 files changed, 26 insertions, 1 deletions

diff --git a/tests/auto/blackbox/testdata/env-normalization/env-normalization.qbs b/tests/auto/blackbox/testdata/env-normalization/env-normalization.qbs
new file mode 100644
index 000000000..a197208fb
--- /dev/null
+++ b/tests/auto/blackbox/testdata/env-normalization/env-normalization.qbs
@@ -0,0 +1,12 @@
+import qbs
+import qbs.Environment
+
+Product {
+    Probe {
+        id: dummy
+        property var env: Environment.currentEnv()
+        configure: {
+            console.info(JSON.stringify(env));
+        }
+    }
+}
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 45054637f..de3268596 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -4879,6 +4879,18 @@ void TestBlackbox::envMerging()
              m_qbsStdout.constData());
 }
 
+void TestBlackbox::envNormalization()
+{
+    QDir::setCurrent(testDataDir + "/env-normalization");
+    QbsRunParameters params;
+    params.environment.insert("myvar", "x");
+    QCOMPARE(runQbs(params), 0);
+    if (HostOsInfo::isWindowsHost())
+        QVERIFY2(m_qbsStdout.contains("\"MYVAR\":\"x\""), m_qbsStdout.constData());
+    else
+        QVERIFY2(m_qbsStdout.contains("\"myvar\":\"x\""), m_qbsStdout.constData());
+}
+
 void TestBlackbox::generatedArtifactAsInputToDynamicRule()
 {
     QDir::setCurrent(testDataDir + "/generated-artifact-as-input-to-dynamic-rule");
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index dbef94e3f..a068aa964 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -87,6 +87,7 @@ private slots:
     void enableExceptions_data();
     void enableRtti();
     void envMerging();
+    void envNormalization();
     void erroneousFiles_data();
     void erroneousFiles();
     void errorInfo();
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp
index eba912b6b..151448a80 100644
--- a/tests/auto/blackbox/tst_blackboxqt.cpp
+++ b/tests/auto/blackbox/tst_blackboxqt.cpp
@@ -273,7 +273,7 @@ void TestBlackboxQt::quickCompiler()
     const bool hasCompiler = m_qbsStdout.contains("compiler available");
     const bool doesNotHaveCompiler = m_qbsStdout.contains("compiler not available");
     QVERIFY2(hasCompiler || doesNotHaveCompiler, m_qbsStdout.constData());
-    QCOMPARE(m_qbsStdout.contains("compiling test_qml.cpp"), hasCompiler);
+    QCOMPARE(m_qbsStdout.contains("compiling qml_subdir_test_qml.cpp"), hasCompiler);
     if (doesNotHaveCompiler)
         QSKIP("qtquickcompiler not available");
 }