Merge "Merge 1.12 into master"

3 files changed, 51 insertions, 6 deletions

diff --git a/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs b/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs
index 3237e90dc..571feced8 100644
--- a/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs
+++ b/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs
@@ -6,6 +6,11 @@ Project {
 
         Depends { name: 'cpp' }
 
+        Properties {
+            condition: qbs.toolchain.contains("gcc")
+            cpp.cxxFlags: "-march=native"
+        }
+
         Group {
             cpp.defines: ['WORLD="BANANA"']
             files : [ "main.cpp" ]
diff --git a/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs b/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs
index 2d9c95e95..879138536 100644
--- a/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs
+++ b/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs
@@ -55,4 +55,31 @@ Project {
             }
         }
     }
+
+    Product {
+        name: "p"
+        type: "p_type"
+        Rule {
+            multiplex: true
+            Artifact { filePath: "dummy1"; fileTags: "d_type" }
+            prepare: {
+                var cmd = new JavaScriptCommand();
+                cmd.description = "generating " + output.fileName;
+                cmd.sourceCode = function() {
+                    var blubb = product.artifacts.qbs;
+                };
+                return cmd;
+            }
+        }
+        Rule {
+            inputs: "d_type"
+            Artifact { filePath: "dummy2"; fileTags: "p_type" }
+            prepare: {
+                var cmd = new JavaScriptCommand();
+                cmd.description = "generating " + output.fileName;
+                cmd.sourceCode = function() { };
+                return cmd;
+            }
+        }
+    }
 }
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 803264ab8..b79e7063c 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -392,12 +392,14 @@ void TestBlackbox::artifactsMapChangeTracking()
     QVERIFY2(m_qbsStdout.contains("running rule for test.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("creating test.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("linking"), m_qbsStdout.constData());
-    QCOMPARE(runQbs(QStringList{"-p", "meta"}), 0);
+    QCOMPARE(runQbs(QStringList{"-p", "meta,p"}), 0);
     QVERIFY2(m_qbsStdout.contains("printing artifacts"), m_qbsStdout.constData());
     QVERIFY2(!m_qbsStdout.contains("test.txt"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("main.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("test.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("TheBinary"), m_qbsStdout.constData());
+    QVERIFY2(m_qbsStdout.contains("dummy1"), m_qbsStdout.constData());
+    QVERIFY2(m_qbsStdout.contains("dummy2"), m_qbsStdout.constData());
 
     // Change name of target binary. Command must be re-run, because the file name of an
     // artifact changed.
@@ -409,13 +411,15 @@ void TestBlackbox::artifactsMapChangeTracking()
     QVERIFY2(!m_qbsStdout.contains("running rule for test.cpp"), m_qbsStdout.constData());
     QVERIFY2(!m_qbsStdout.contains("creating test.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("linking"), m_qbsStdout.constData());
-    QCOMPARE(runQbs(QStringList{"-p", "meta"}), 0);
+    QCOMPARE(runQbs(QStringList{"-p", "meta,p"}), 0);
     QVERIFY2(m_qbsStdout.contains("printing artifacts"), m_qbsStdout.constData());
     QVERIFY2(!m_qbsStdout.contains("test.txt"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("main.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("test.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("TheNewBinary"), m_qbsStdout.constData());
     QVERIFY2(!m_qbsStdout.contains("TheBinary"), m_qbsStdout.constData());
+    QVERIFY2(!m_qbsStdout.contains("dummy1"), m_qbsStdout.constData());
+    QVERIFY2(!m_qbsStdout.contains("dummy2"), m_qbsStdout.constData());
 
     // Add file tag to generated artifact. Command must be re-run, because it enumerates the keys
     // of the artifacts map.
@@ -425,12 +429,14 @@ void TestBlackbox::artifactsMapChangeTracking()
     QVERIFY2(m_qbsStdout.contains("running rule for test.cpp"), m_qbsStdout.constData());
     QVERIFY2(!m_qbsStdout.contains("creating test.cpp"), m_qbsStdout.constData());
     QVERIFY2(!m_qbsStdout.contains("linking"), m_qbsStdout.constData());
-    QCOMPARE(runQbs(QStringList{"-p", "meta"}), 0);
+    QCOMPARE(runQbs(QStringList{"-p", "meta,p"}), 0);
     QVERIFY2(m_qbsStdout.contains("printing artifacts"), m_qbsStdout.constData());
     QVERIFY2(!m_qbsStdout.contains("test.txt"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("main.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("test.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("TheNewBinary"), m_qbsStdout.constData());
+    QVERIFY2(!m_qbsStdout.contains("dummy1"), m_qbsStdout.constData());
+    QVERIFY2(!m_qbsStdout.contains("dummy2"), m_qbsStdout.constData());
 
     // Add redundant file tag to generated artifact. Command must not be re-run, because
     // the artifacts map has not changed.
@@ -442,8 +448,10 @@ void TestBlackbox::artifactsMapChangeTracking()
     QVERIFY2(!m_qbsStdout.contains("running rule for test.cpp"), m_qbsStdout.constData());
     QVERIFY2(!m_qbsStdout.contains("creating test.cpp"), m_qbsStdout.constData());
     QVERIFY2(!m_qbsStdout.contains("linking"), m_qbsStdout.constData());
-    QCOMPARE(runQbs(QStringList{"-p", "meta"}), 0);
+    QCOMPARE(runQbs(QStringList{"-p", "meta,p"}), 0);
     QVERIFY2(!m_qbsStdout.contains("printing artifacts"), m_qbsStdout.constData());
+    QVERIFY2(!m_qbsStdout.contains("dummy1"), m_qbsStdout.constData());
+    QVERIFY2(!m_qbsStdout.contains("dummy2"), m_qbsStdout.constData());
 
     // Rebuild the app. Command must not be re-run, because the artifacts map has not changed.
     WAIT_FOR_NEW_TIMESTAMP();
@@ -452,8 +460,10 @@ void TestBlackbox::artifactsMapChangeTracking()
     QVERIFY2(!m_qbsStdout.contains("running rule for test.cpp"), m_qbsStdout.constData());
     QVERIFY2(!m_qbsStdout.contains("creating test.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("linking"), m_qbsStdout.constData());
-    QCOMPARE(runQbs(QStringList{"-p", "meta"}), 0);
+    QCOMPARE(runQbs(QStringList{"-p", "meta,p"}), 0);
     QVERIFY2(!m_qbsStdout.contains("printing artifacts"), m_qbsStdout.constData());
+    QVERIFY2(!m_qbsStdout.contains("dummy1"), m_qbsStdout.constData());
+    QVERIFY2(!m_qbsStdout.contains("dummy2"), m_qbsStdout.constData());
 
     // Add source file to app. Command must be re-run, because the artifacts map has changed.
     WAIT_FOR_NEW_TIMESTAMP();
@@ -463,12 +473,14 @@ void TestBlackbox::artifactsMapChangeTracking()
     QVERIFY2(!m_qbsStdout.contains("running rule for test.cpp"), m_qbsStdout.constData());
     QVERIFY2(!m_qbsStdout.contains("creating test.cpp"), m_qbsStdout.constData());
     QVERIFY2(!m_qbsStdout.contains("linking"), m_qbsStdout.constData());
-    QCOMPARE(runQbs(QStringList{"-p", "meta"}), 0);
+    QCOMPARE(runQbs(QStringList{"-p", "meta,p"}), 0);
     QVERIFY2(m_qbsStdout.contains("printing artifacts"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("test.txt"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("main.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("test.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("TheNewBinary"), m_qbsStdout.constData());
+    QVERIFY2(!m_qbsStdout.contains("dummy1"), m_qbsStdout.constData());
+    QVERIFY2(!m_qbsStdout.contains("dummy2"), m_qbsStdout.constData());
 }
 
 void TestBlackbox::artifactsMapInvalidation()
@@ -6404,6 +6416,7 @@ void TestBlackbox::groupsInModules()
     WAIT_FOR_NEW_TIMESTAMP();
     touch("modules/helper/diamondc.c");
 
+    waitForFileUnlock();
     QCOMPARE(runQbs(params), 0);
     QVERIFY(m_qbsStdout.contains("compiling diamondc.c"));
     QVERIFY(m_qbsStdout.contains("compile rock.coal => rock.diamond"));