diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2014-05-29 23:43:34 -0400 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-06-02 11:46:18 +0200 |
| commit | 5c388a1e76e03e5afe30c7b5aa18ad272cba2e49 (patch) | |
| tree | 1f8c7a1c3b4ea2c848cea0994ecd34e81a629870 /tests/auto | |
| parent | edfb5130b20e3758a7eed9fe73d0174514c03d53 (diff) | |
Fix WiX autotest.
Change-Id: I2b52a0ef469fd3faa036556babed20300837606d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/blackbox/testdata/wix/WiXInstallers.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs index 718901675..4fa24f5e7 100644 --- a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs +++ b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs @@ -13,7 +13,7 @@ Project { name: "QbsBootstrapper" targetName: "qbs-setup-" + qbs.architecture files: ["QbsBootstrapper.wxs"] - wix.defines: ["msiName=qbs-" + qbs.architecture + ".msi"] + wix.defines: ["msiName=" + project.buildDirectory + "/QbsSetup/qbs-" + qbs.architecture + ".msi"] } WindowsInstallerPackage { diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 86895c114..150baaefd 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -2026,8 +2026,8 @@ void TestBlackbox::testWiX() 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(regularFileExists(buildDir + "/qbs-" + arch + ".msi")); - QVERIFY(regularFileExists(buildDir + "/qbs-setup-" + arch + ".exe")); + QVERIFY(regularFileExists(buildDir + "/QbsSetup/qbs-" + arch + ".msi")); + QVERIFY(regularFileExists(buildDir + "/QbsBootstrapper/qbs-setup-" + arch + ".exe")); } static QString findExecutable(const QStringList &fileNames) |