diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-04-26 14:29:01 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-04-27 07:58:46 +0000 |
| commit | 1e092969ae070e3a967dd86ed06fd8531f94cd6f (patch) | |
| tree | fac45924a9d1522780ac06bc3cc12b1aeb2d5c9a | |
| parent | adf00fb1a0faed60b045dced0773761b5cf89251 (diff) | |
codesign: skip test for mingw toolchain
Also, skipt the test for MSVC when certificate was not found.
Change-Id: I27103f9cab4793947eb3f5b1afd0bac557fe68ac
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | tests/auto/blackbox/testdata-windows/codesign/codesign.qbs | 8 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxwindows.cpp | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/blackbox/testdata-windows/codesign/codesign.qbs b/tests/auto/blackbox/testdata-windows/codesign/codesign.qbs index 2b48c67ff..ef6447ab7 100644 --- a/tests/auto/blackbox/testdata-windows/codesign/codesign.qbs +++ b/tests/auto/blackbox/testdata-windows/codesign/codesign.qbs @@ -9,6 +9,7 @@ Project { CppApplication { name: "A" files: "app.cpp" + condition: qbs.toolchain.contains("msvc") codesign.enableCodeSigning: project.enableSigning codesign.hashAlgorithm: project.hashAlgorithm codesign.subjectName: project.subjectName @@ -16,7 +17,8 @@ Project { install: true installDir: "" property bool dummy: { - console.info("signtool path: %%" + codesign.codesignPath + "%%"); + if (codesign.codesignPath) + console.info("signtool path: %%" + codesign.codesignPath + "%%"); } } @@ -24,6 +26,7 @@ Project { Depends { name: "cpp" } name: "B" files: "app.cpp" + condition: qbs.toolchain.contains("msvc") codesign.enableCodeSigning: project.enableSigning codesign.hashAlgorithm: project.hashAlgorithm codesign.subjectName: project.subjectName @@ -31,7 +34,8 @@ Project { install: true installDir: "" property bool dummy: { - console.info("signtool path: %%" + codesign.codesignPath + "%%"); + if (codesign.codesignPath) + console.info("signtool path: %%" + codesign.codesignPath + "%%"); } } } diff --git a/tests/auto/blackbox/tst_blackboxwindows.cpp b/tests/auto/blackbox/tst_blackboxwindows.cpp index 0c82754fb..e3fb98457 100644 --- a/tests/auto/blackbox/tst_blackboxwindows.cpp +++ b/tests/auto/blackbox/tst_blackboxwindows.cpp @@ -136,7 +136,7 @@ void TestBlackboxWindows::standaloneCodesign() QCOMPARE(runQbs(params), 0); if (!m_qbsStdout.contains("signtool path:")) - QFAIL("No current signtool path pattern exists"); + QSKIP("No current signtool path pattern exists"); const auto signtoolPath = extractSigntoolPath(m_qbsStdout); QVERIFY(QFileInfo(signtoolPath).exists()); |