diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2017-09-01 15:34:35 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-09-01 15:34:35 +0200 |
commit | 79f9988ede8dbee3b0fb84ddc4413aacd70afc91 (patch) | |
tree | 4bbf4b728c6cf92bfa85df056e71a39237acb053 /tests | |
parent | e669bb02ca8f76641a94b820cbab6b6699e264c7 (diff) | |
parent | 9077f10d46909259effab143dc3d0e448e19ee8a (diff) |
Merge 1.9 into master
Change-Id: I8f29ec41a4f3bc87be39abe37398d8345012be5b
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/api/testdata/multiplexing/multiplexing.qbs | 178 | ||||
-rw-r--r-- | tests/auto/api/tst_api.cpp | 2 |
2 files changed, 94 insertions, 86 deletions
diff --git a/tests/auto/api/testdata/multiplexing/multiplexing.qbs b/tests/auto/api/testdata/multiplexing/multiplexing.qbs index 9027743b4..3d099eb7a 100644 --- a/tests/auto/api/testdata/multiplexing/multiplexing.qbs +++ b/tests/auto/api/testdata/multiplexing/multiplexing.qbs @@ -2,93 +2,101 @@ import qbs import qbs.TextFile Project { - Product { - name: "no-multiplexing" - type: ["reversed-text"] - files: ["foo.txt"] - } - Product { - name: "multiplex-without-aggregator-2" - type: ["reversed-text"] - files: ["foo.txt"] - multiplexByQbsProperties: ["architectures"] - qbs.architectures: ["TRS-80", "C64"] - } - Product { - name: "multiplex-with-export" - type: ["reversed-text"] - files: ["foo.txt"] - multiplexByQbsProperties: ["architectures"] - qbs.architectures: ["TRS-80", "C64"] - Export { Depends { name: "multiplex-without-aggregator-2" } } - } - Product { - name: "nonmultiplex-with-export" - type: ["reversed-text"] - files: ["foo.txt"] - Export { Depends { name: "multiplex-without-aggregator-2" } } - } - Product { - name: "nonmultiplex-exporting-aggregation" - type: ["reversed-text"] - files: ["foo.txt"] - Export { Depends { name: "multiplex-with-aggregator-2" } } - } - Product { - name: "multiplex-using-export" - type: ["reversed-text"] - files: ["foo.txt"] - multiplexByQbsProperties: ["architectures"] - qbs.architectures: ["TRS-80", "C64"] - Depends { name: "multiplex-with-export" } - } - Product { - name: "multiplex-without-aggregator-2-depend-on-non-multiplexed" - type: ["reversed-text"] - files: ["foo.txt"] - multiplexByQbsProperties: ["architectures"] - qbs.architectures: ["TRS-80", "C64"] - Depends { name: "no-multiplexing" } - } - Product { - name: "multiplex-without-aggregator-4" - type: ["reversed-text"] - files: ["foo.txt"] - multiplexByQbsProperties: ["architectures", "buildVariants"] - qbs.architectures: ["TRS-80", "C64"] - qbs.buildVariants: ["debug", "release"] - } - Product { - name: "multiplex-with-aggregator-2" - type: ["reversed-text"] - files: ["foo.txt"] - aggregate: true - multiplexByQbsProperties: ["architectures"] - qbs.architectures: ["TRS-80", "C64"] - qbs.architecture: "Atari ST" - } - Product { - name: "multiplex-with-aggregator-2-dependent" - Depends { name: "multiplex-with-aggregator-2" } - type: ["something"] - files: ["foo.txt"] - } - Product { - name: "non-multiplexed-with-dependencies-on-multiplexed" - Depends { name: "multiplex-without-aggregator-2" } - } - Product { - name: "non-multiplexed-with-dependencies-on-multiplexed-via-export1" - Depends { name: "multiplex-with-export" } - } - Product { - name: "non-multiplexed-with-dependencies-on-multiplexed-via-export2" - Depends { name: "nonmultiplex-with-export" } + Project { + name: "subproject 1" + Product { + name: "multiplex-using-export" + type: ["reversed-text"] + files: ["foo.txt"] + multiplexByQbsProperties: ["architectures"] + qbs.architectures: ["TRS-80", "C64"] + Depends { name: "multiplex-with-export" } + } + Product { + name: "multiplex-without-aggregator-2-depend-on-non-multiplexed" + type: ["reversed-text"] + files: ["foo.txt"] + multiplexByQbsProperties: ["architectures"] + qbs.architectures: ["TRS-80", "C64"] + Depends { name: "no-multiplexing" } + } + Product { + name: "multiplex-with-aggregator-2" + type: ["reversed-text"] + files: ["foo.txt"] + aggregate: true + multiplexByQbsProperties: ["architectures"] + qbs.architectures: ["TRS-80", "C64"] + qbs.architecture: "Atari ST" + } + Product { + name: "multiplex-with-aggregator-2-dependent" + Depends { name: "multiplex-with-aggregator-2" } + type: ["something"] + files: ["foo.txt"] + } + Product { + name: "non-multiplexed-with-dependencies-on-multiplexed" + Depends { name: "multiplex-without-aggregator-2" } + } + Product { + name: "non-multiplexed-with-dependencies-on-multiplexed-via-export1" + Depends { name: "multiplex-with-export" } + } + Product { + name: "non-multiplexed-with-dependencies-on-multiplexed-via-export2" + Depends { name: "nonmultiplex-with-export" } + } + Product { + name: "non-multiplexed-with-dependencies-on-aggregation-via-export" + Depends { name: "nonmultiplex-exporting-aggregation" } + } } - Product { - name: "non-multiplexed-with-dependencies-on-aggregation-via-export" - Depends { name: "nonmultiplex-exporting-aggregation" } + + Project { + name: "subproject 2" + Product { + name: "no-multiplexing" + type: ["reversed-text"] + files: ["foo.txt"] + } + Product { + name: "multiplex-without-aggregator-2" + type: ["reversed-text"] + files: ["foo.txt"] + multiplexByQbsProperties: ["architectures"] + qbs.architectures: ["TRS-80", "C64"] + } + Product { + name: "multiplex-with-export" + type: ["reversed-text"] + files: ["foo.txt"] + multiplexByQbsProperties: ["architectures"] + qbs.architectures: ["TRS-80", "C64"] + Export { Depends { name: "multiplex-without-aggregator-2" } } + } + Product { + name: "nonmultiplex-with-export" + type: ["reversed-text"] + files: ["foo.txt"] + Export { Depends { name: "multiplex-without-aggregator-2" } } + } + Product { + name: "nonmultiplex-exporting-aggregation" + type: ["reversed-text"] + files: ["foo.txt"] + Export { Depends { name: "multiplex-with-aggregator-2" } } + } + Product { + name: "multiplex-without-aggregator-4" + type: ["reversed-text"] + files: ["foo.txt"] + multiplexByQbsProperties: ["architectures", "buildVariants"] + qbs.architectures: ["TRS-80", "C64"] + qbs.buildVariants: ["debug", "release"] + } } + Product { name: "aggregate-with-dependencies-on-aggregation-via-export" Depends { name: "nonmultiplex-exporting-aggregation" } diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index f101bb8e0..528714704 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -1813,7 +1813,7 @@ void TestApi::multiplexing() waitForFinished(setupJob.get()); QVERIFY2(!setupJob->error().hasError(), qPrintable(setupJob->error().toString())); qbs::Project project = setupJob->project(); - QList<qbs::ProductData> products = project.projectData().products(); + QList<qbs::ProductData> products = project.projectData().allProducts(); qbs::ProductData product; ProductDataSelector selector; selector.name = "no-multiplexing"; |