aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/auto/blackbox/testdata-windows/codesign/codesign.qbs8
-rw-r--r--tests/auto/blackbox/tst_blackboxwindows.cpp2
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());