diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2020-10-24 18:32:08 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-10-26 13:53:28 +0000 |
commit | ceae7f16e5a52fc553f508d616931ee438f3b4e8 (patch) | |
tree | 0ce12c9402a7f3adf352bc71054ca615b6083ac3 | |
parent | 6bceb1b73945e636087ca5afda431172b02ae0af (diff) |
Fix qbs.buildVariant in appleMultiConfig() test
Should be "profiling", not "profile"
Change-Id: I79f1607a4a1880a67bb49b08dfabbe0a5715aaa7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs | 10 | ||||
-rw-r--r-- | tests/auto/blackbox/tst_blackboxapple.cpp | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs index caf7e5768..c1d35eb8c 100644 --- a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs +++ b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs @@ -109,7 +109,7 @@ Project { cpp.minimumMacosVersion: "10.6" cpp.minimumIosVersion: "8.0" qbs.architectures: Helpers.getArchitectures(qbs, project.xcodeVersion) - qbs.buildVariants: ["debug", "profile"] + qbs.buildVariants: ["debug", "profiling"] install: true installDir: "" @@ -125,7 +125,7 @@ Project { cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined cpp.defines: ["VARIANT=" + Utilities.cStringQuote(qbs.buildVariant)] qbs.architectures: Helpers.getArchitectures(qbs, project.xcodeVersion) - qbs.buildVariants: ["release", "debug", "profile"] + qbs.buildVariants: ["release", "debug", "profiling"] install: true installDir: "" @@ -141,7 +141,7 @@ Project { cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined cpp.defines: ["VARIANT=" + Utilities.cStringQuote(qbs.buildVariant)] qbs.architectures: Helpers.getArchitectures(qbs, project.xcodeVersion) - qbs.buildVariants: ["debug", "profile"] + qbs.buildVariants: ["debug", "profiling"] install: true installDir: "" @@ -157,7 +157,7 @@ Project { cpp.sonamePrefix: "@rpath" cpp.defines: ["VARIANT=" + Utilities.cStringQuote(qbs.buildVariant)] qbs.architectures: Helpers.getArchitectures(qbs, project.xcodeVersion) - qbs.buildVariants: ["debug", "profile"] + qbs.buildVariants: ["debug", "profiling"] install: true installDir: "" } @@ -170,7 +170,7 @@ Project { cpp.sonamePrefix: "@rpath" cpp.defines: ["VARIANT=" + Utilities.cStringQuote(qbs.buildVariant)] qbs.architectures: Helpers.getArchitectures(qbs, project.xcodeVersion) - qbs.buildVariants: ["debug", "profile"] + qbs.buildVariants: ["debug", "profiling"] install: true installDir: "" } diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp index a8f86aeba..77ea2f155 100644 --- a/tests/auto/blackbox/tst_blackboxapple.cpp +++ b/tests/auto/blackbox/tst_blackboxapple.cpp @@ -194,7 +194,7 @@ void TestBlackboxApple::appleMultiConfig() QVERIFY(QFileInfo2(defaultInstallRoot + "/fatmultiappmultivariant.app/Contents/MacOS/" "fatmultiappmultivariant_debug").isExecutable()); QVERIFY(QFileInfo2(defaultInstallRoot + "/fatmultiappmultivariant.app/Contents/MacOS/" - "fatmultiappmultivariant_profile").isExecutable()); + "fatmultiappmultivariant_profiling").isExecutable()); QVERIFY(QFileInfo2(defaultInstallRoot + "/fatmultiappmultivariant.app/Contents/Info.plist") .isRegularFile()); QVERIFY(QFileInfo2(defaultInstallRoot + "/fatmultiappmultivariant.app/Contents/PkgInfo") @@ -206,12 +206,12 @@ void TestBlackboxApple::appleMultiConfig() QVERIFY(QFileInfo2(defaultInstallRoot + "/multilib.framework/Versions/A").isRegularDir()); QVERIFY(QFileInfo2(defaultInstallRoot + "/multilib.framework/Versions/A/multilib").isRegularFile()); QVERIFY(QFileInfo2(defaultInstallRoot + "/multilib.framework/Versions/A/multilib_debug").isRegularFile()); - QVERIFY(QFileInfo2(defaultInstallRoot + "/multilib.framework/Versions/A/multilib_profile").isRegularFile()); + QVERIFY(QFileInfo2(defaultInstallRoot + "/multilib.framework/Versions/A/multilib_profiling").isRegularFile()); QVERIFY(QFileInfo2(defaultInstallRoot + "/multilib.framework/Versions/A/Resources").isRegularDir()); QVERIFY(QFileInfo2(defaultInstallRoot + "/multilib.framework/Versions/A/Resources/Info.plist").isRegularFile()); QVERIFY(QFileInfo2(defaultInstallRoot + "/multilib.framework/Versions/Current").isDirSymLink()); - for (const QString &variant : { "release", "debug", "profile" }) { + for (const QString &variant : { "release", "debug", "profiling" }) { for (const QString &arch : { "x86_64" }) { QProcess process; process.setProgram("/usr/bin/arch"); @@ -253,7 +253,7 @@ void TestBlackboxApple::appleMultiConfig() QVERIFY(QFileInfo2(defaultInstallRoot + "/fatmultiappmultivariant.app/" "fatmultiappmultivariant_debug").isExecutable()); QVERIFY(QFileInfo2(defaultInstallRoot + "/fatmultiappmultivariant.app/" - "fatmultiappmultivariant_profile").isExecutable()); + "fatmultiappmultivariant_profiling").isExecutable()); QVERIFY(QFileInfo2(defaultInstallRoot + "/fatmultiappmultivariant.app/Info.plist") .isRegularFile()); QVERIFY(QFileInfo2(defaultInstallRoot + "/fatmultiappmultivariant.app/PkgInfo") @@ -261,7 +261,7 @@ void TestBlackboxApple::appleMultiConfig() QVERIFY(QFileInfo2(defaultInstallRoot + "/multilib.framework/multilib").isRegularFile()); QVERIFY(QFileInfo2(defaultInstallRoot + "/multilib.framework/multilib_debug").isRegularFile()); - QVERIFY(QFileInfo2(defaultInstallRoot + "/multilib.framework/multilib_profile").isRegularFile()); + QVERIFY(QFileInfo2(defaultInstallRoot + "/multilib.framework/multilib_profiling").isRegularFile()); QVERIFY(QFileInfo2(defaultInstallRoot + "/multilib.framework/Info.plist").isRegularFile()); } else { QVERIFY2(false, qPrintable(m_qbsStdout)); |