diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2014-04-07 13:38:19 -0400 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2014-04-11 01:27:54 +0200 |
| commit | 7343f111666c0560737f4156982f17cac1e8814b (patch) | |
| tree | 25de948830262add931bb0baacf2b1ab7462d937 /tests | |
| parent | 9ab4669eff693e80090db5ad2f08633518f5abde (diff) | |
Fix linking of MSIs built from multiple WiX source files.
Task-number: QBS-541
Change-Id: I177c755ee203df1018039683da860b26dd9ec820
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/testdata/wix/Qt.wxs | 5 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/wix/WiXInstallers.qbs | 6 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 2 |
3 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/wix/Qt.wxs b/tests/auto/blackbox/testdata/wix/Qt.wxs new file mode 100644 index 000000000..fbd992c43 --- /dev/null +++ b/tests/auto/blackbox/testdata/wix/Qt.wxs @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Fragment> + </Fragment> +</Wix> diff --git a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs index 6f4adfe8f..17eafda82 100644 --- a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs +++ b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs @@ -15,4 +15,10 @@ Project { files: ["QbsBootstrapper.wxs"] wix.defines: ["msiName=qbs-" + qbs.architecture + ".msi"] } + + WindowsInstallerPackage { + name: "RegressionBuster9000" + files: ["QbsSetup.wxs", "Qt.wxs"] + wix.defines: ["scriptName=ExampleScript.bat"] + } } diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index e9b067322..d4ff742cb 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -1974,6 +1974,8 @@ void TestBlackbox::testWiX() QCOMPARE(runQbs(), 0); QVERIFY(m_qbsStdout.contains("compiling QbsSetup.wxs")); QVERIFY(m_qbsStdout.contains("compiling QbsBootstrapper.wxs")); + QVERIFY(m_qbsStdout.contains("linking qbs-" + arch + ".msi")); + QVERIFY(m_qbsStdout.contains("linking qbs-setup-" + arch + ".exe")); QVERIFY(QFile::exists(buildDir + "/qbs-" + arch + ".msi")); QVERIFY(QFile::exists(buildDir + "/qbs-setup-" + arch + ".exe")); } |