diff options
Diffstat (limited to 'tests/auto/blackbox')
5 files changed, 14 insertions, 3 deletions
diff --git a/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs b/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs index db5f15b18..705f054a8 100644 --- a/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs +++ b/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs @@ -134,6 +134,9 @@ Project { name: "G" bundle.isBundle: true bundle.resources: ["resource.txt"] + // XCode 12.5 does not support com.apple.product-type.in-app-purchase-content type anymore, + // so use older specs from Qbs + bundle._useXcodeBuildSpecs: false Group { fileTagsFilter: product.type.concat(project.bundleFileTags) qbs.install: true diff --git a/tests/auto/blackbox/testdata-apple/infoPlistVariables/Info.plist b/tests/auto/blackbox/testdata-apple/infoPlistVariables/Info.plist index b357378ac..cb879d70c 100644 --- a/tests/auto/blackbox/testdata-apple/infoPlistVariables/Info.plist +++ b/tests/auto/blackbox/testdata-apple/infoPlistVariables/Info.plist @@ -18,5 +18,7 @@ <string>${${EXE}_NAME}</string> <key>BracesNested</key> <string>${${EXE}_NAME}</string> + <key>WithDefault</key> + <string>${NON_EXISTING:default=DEFAULT}</string> </dict> </plist> 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_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp index 884d2c077..8c9792211 100644 --- a/tests/auto/blackbox/tst_blackboxapple.cpp +++ b/tests/auto/blackbox/tst_blackboxapple.cpp @@ -1069,6 +1069,8 @@ void TestBlackboxApple::infoPlistVariables() QStringLiteral("infoPlistVariables")); QCOMPARE(content.value(QStringLiteral("BracesNested")), QStringLiteral("infoPlistVariables")); + QCOMPARE(content.value(QStringLiteral("WithDefault")), + QStringLiteral("DEFAULT")); } void TestBlackboxApple::objcArc() diff --git a/tests/auto/blackbox/tst_blackboxwindows.cpp b/tests/auto/blackbox/tst_blackboxwindows.cpp index d1d62496c..94257c062 100644 --- a/tests/auto/blackbox/tst_blackboxwindows.cpp +++ b/tests/auto/blackbox/tst_blackboxwindows.cpp @@ -180,7 +180,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()); |