diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2020-04-28 16:23:59 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-04-28 16:23:59 +0200 |
commit | 3b364a835d63bbb23fafd02dde9f1d9643f82655 (patch) | |
tree | baee560a0527a8b50173e69c8acb3e730e25eceb /tests/auto/blackbox | |
parent | 4ea8e5acc473d40ae2b6ee9f0c13de479bfd6d37 (diff) | |
parent | 42994febafe0f0f2d2d3a1bfeffa33b854f22132 (diff) |
Merge 1.16 into master
Change-Id: I61e285f8e9f66451553df2b69c556f995993498c
Diffstat (limited to 'tests/auto/blackbox')
-rw-r--r-- | tests/auto/blackbox/testdata/install-locations/install-locations.qbs | 3 | ||||
-rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/tests/auto/blackbox/testdata/install-locations/install-locations.qbs b/tests/auto/blackbox/testdata/install-locations/install-locations.qbs index 4ad37c498..c5d07077f 100644 --- a/tests/auto/blackbox/testdata/install-locations/install-locations.qbs +++ b/tests/auto/blackbox/testdata/install-locations/install-locations.qbs @@ -6,6 +6,9 @@ Project { console.info("is mac"); else console.info("is unix"); + + if (qbs.toolchain.contains("mingw")) + console.info("is mingw"); } CppApplication { name: "theapp" diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 2eaf3e3be..7447009b5 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -4043,6 +4043,7 @@ void TestBlackbox::installLocations() const bool isWindows = m_qbsStdout.contains("is windows"); const bool isMac = m_qbsStdout.contains("is mac"); const bool isUnix = m_qbsStdout.contains("is unix"); + const bool isMingw = m_qbsStdout.contains("is mingw"); QVERIFY(isWindows || isMac || isUnix); QCOMPARE(runQbs(QbsRunParameters(QStringList("--clean-install-root"))), 0); @@ -4064,7 +4065,9 @@ void TestBlackbox::installLocations() isMac ? "thelib.framework" : "" }; const BinaryInfo dllDsym = { - isWindows ? "thelib.pdb" : isMac ? "thelib.framework.dSYM" : "libthelib.so.debug", + isWindows + ? (!isMingw ? "thelib.pdb" : "thelib.dll.debug") + : isMac ? "thelib.framework.dSYM" : "libthelib.so.debug", dsymDir.isEmpty() ? dll.installDir : dsymDir, {} }; @@ -4074,7 +4077,9 @@ void TestBlackbox::installLocations() isMac ? "theplugin.bundle/Contents/MacOS" : "" }; const BinaryInfo pluginDsym = { - isWindows ? "theplugin.pdb" : isMac ? "theplugin.bundle.dSYM" : "libtheplugin.so.debug", + isWindows + ? (!isMingw ? "theplugin.pdb" : "theplugin.dll.debug") + : isMac ? "theplugin.bundle.dSYM" : "libtheplugin.so.debug", dsymDir.isEmpty() ? plugin.installDir : dsymDir, {} }; @@ -4084,7 +4089,9 @@ void TestBlackbox::installLocations() isMac ? "theapp.app/Contents/MacOS" : "" }; const BinaryInfo appDsym = { - isWindows ? "theapp.pdb" : isMac ? "theapp.app.dSYM" : "theapp.debug", + isWindows + ? (!isMingw ? "theapp.pdb" : "theapp.exe.debug") + : isMac ? "theapp.app.dSYM" : "theapp.debug", dsymDir.isEmpty() ? app.installDir : dsymDir, {} }; |