summaryrefslogtreecommitdiff
path: root/tests/auto/blackbox/testdata-apple
Commit message (Collapse)AuthorAgeFilesLines
* Remove `import qbs` from all project filesDenis Shienkov2021-08-041-2/+0
| | | | | | | | | | | | | | ... because we don't need in this inclusion at all. But for some cases it is impossible to remove that inclusions (and even to move on next lines) because then the some tests are failed by unknown reason. For those tests were added the following comments on the inclusion lines: `// FIXME: Don't remove this import because then the test fails!` Change-Id: I9153fd0e38b94af08168e499ee46a23889ee4d73 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* codesign: Fix checking if product is a frameworkIvan Komissarov2021-06-141-0/+3
| | | | | | | | | | | | | It is not correct to check for the frameworkVersion to determine if product is a Framework - e.g. Xcode always sets this variable. Instead, product.type or product.bundle.packageType should be checked instead. This fixes the problem when codesign incorrectly determines bundle as a framework if product.version is set. Fixes: QBS-1649 Change-Id: I067e852df82a43897000d45e27908dd5e22eac70 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix reading Xcode 12.5 specsv1.19.0Ivan Komissarov2021-05-032-0/+5
| | | | | | | | | | | | | | | Since Xcode 12.5, common specs for darwin platforms were moved to "Darwin Package/Product Types.xcspec" in the different folder. However, the old configs are still present, so we need to merge info from both variants. Also, allow to use undefined variables in .xcspec files - since 12.5, this is a valid use-case. Also, implement the "default=" variable formatter used as a fallback when variable is not set. Fixes: QBS-1644 Change-Id: I9a55c5d511cbb01f30219478ee9f3b85763a08d5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* codesign: do not sign intermediate products when multiplexingIvan Komissarov2021-03-303-1/+11
| | | | | | | We should only sign the resulting binary during the lipo step. Change-Id: If4d508bcdf347bf2fc68d345ed8d5913a7457f8d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Run appleMultiConfig test with arm64 on newer XcodeIvan Komissarov2021-03-211-7/+14
| | | | | Change-Id: If8d579b612d8c44f697495d2ca985f7c34310682 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Implement codesign moduleJake Petroules2021-02-182-0/+39
| | | | | | | | | | | | | | | This moves code signing functionality into a dedicated module, and also implements automatic provisioning for Apple platforms, which automatically selects appropriate signing identities and provisioning profiles based on the product being built. This also results in a significant performance improvement since all code signing setup information is retrieved in process instead of forking off the openssl and security command line tools. Task-number: QBS-899 Change-Id: I60d0aeaeb2d1004929505bcb1e0bc77512fe77bc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add TestBlackboxApple::appiconset testIvan Komissarov2020-12-1433-0/+310
| | | | | | | | | This test verifies the possibility to use "*.appiconset" assets for application icons Task-number: QBS-1627 Change-Id: I2480dcb76d046d91333295926db40cdd6d4c32bd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix assetCatalog test for macOS 11.*Ivan Komissarov2020-12-141-1/+2
| | | | | Change-Id: I94755e03572003275483a4bac95660a007dff0bc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Xcode: fix apple-multiconfig test for ios-simulatorIvan Komissarov2020-10-261-2/+2
| | | | | Change-Id: I0db7d7104cd06521291970a51ddf0a6f55cc71a6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix qbs.buildVariant in appleMultiConfig() testIvan Komissarov2020-10-261-5/+5
| | | | | | | Should be "profiling", not "profile" Change-Id: I79f1607a4a1880a67bb49b08dfabbe0a5715aaa7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix usage of @VAR@ in info plist filesIvan Komissarov2020-10-083-0/+39
| | | | | | | Fixes: QBS-1601 Change-Id: Iead18bf5fd25f965cf9f9748469f2469488eabc8 Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Make TestBlackboxApple::aggregateDependencyLinking smarterIvan Komissarov2020-08-071-3/+24
| | | | | | | | Now it covers old macs, ios and new arm64 macs Task-number: QBS-1456 Change-Id: Icc7d7ca040266a85947c29f3b5d8f191c07cfffe Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix or skip tests to be able to run with the iOS profileIvan Komissarov2020-05-226-11/+121
| | | | | | | | | | | | This skips tests that are not possible to run without the device and fixes other tests for the iOS profile. Also, adds Travis job that runs tests using iOS profile. This is the squashed merge commit of the wip/ci-ios branch. Change-Id: Ia0c1fc05fdb8c6e269f5e66f979f2ae19465433c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge branch '1.16' into masterRichard Weickelt2020-04-151-2/+5
|\ | | | | | | Change-Id: Ie3f341fe18e2ffaf676721748279c6b027590727
| * Darwin: Adapt to Xcode 11.4Christian Kandeler2020-04-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | The "Version" entry in SDKSettings.plist has three digits now. Also adapt the deploymentData autotest to take into account that we no longer pass the "version_min" options. Fixes: QBS-1543 Change-Id: Ibc1bcfd44583721c4bed1db812eca892ee316eeb Reviewed-by: Leon Buckel <leon.buckel@clausmark.com> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Fix aggregateDependencyLinking() with XCode 9.4Ivan Komissarov2020-04-151-0/+2
|/ | | | | | | | | | Test failed because of the warning about macOS version mismatch which leaded to additional logging in CommandLineFrontend::handleProcessResultReport() Fixes: QBS-1456 Change-Id: I83dd0eeebd248c0a5ad38b65e29b96358f455404 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add overrideInfoPlist testIvan Komissarov2020-01-153-0/+27
| | | | | | | | This test checks that properties can be overridden in a .qbs file Task-number: QBS-1447 Change-Id: Ib39c7c11f26357bb4074eb9ba7cb2730f25c9441 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix TestBlackboxApple::xcode for tvos/ios/watchos platformsIvan Komissarov2019-06-261-3/+23
| | | | | | Change-Id: Ieed4b81a83e8b8a5c8c061f985587aded3e13ec3 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qbs module: Do not set default values for multiplexing propertiesChristian Kandeler2018-10-311-0/+1
| | | | | | | | | | We cannot know whether these values are what the user wants, or even whether they will work in a given environment. This violates the principle that modules should only pre-populate list properties if they are known to be correct under all sane circumstances. Change-Id: I81ba53fdb619639324a0f54d289d1183c909c4cb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge 1.12 into masterChristian Kandeler2018-10-123-13/+17
|\ | | | | | | Change-Id: I96c735aeda89e02f1fa9107ecfc10ebf4b554dbc
| * Fix autotests for Xcode < 10Christian Kandeler2018-10-081-1/+2
| | | | | | | | | | Change-Id: Ia162d7fb17e69e4d0c30678d0e2e3bf31418a711 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Fix autotests for Xcode 10Christian Kandeler2018-10-053-13/+16
| | | | | | | | | | Change-Id: I0d218f415eedbfc75c2cf10877646f6831f38f89 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Remove the base module import from most test data projectsJoerg Bornemann2018-06-2214-26/+0
| | | | | | | | | | | | | | | | Keep the base import in blackbox/testdata/deprecated-property to ensure we don't accidentally break it. Change-Id: I790da21a7490ec9c1b0335f45e8707e7e04daa7c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge 1.12 into masterChristian Kandeler2018-06-223-0/+55
|\ \ | |/ | | | | Change-Id: I3b5f14cf38452aaa740ac66cffa1e740f7349823
| * Don't link to multiplexed libraries when depending on the aggregateAlexandru Croitor2018-06-203-0/+55
| | | | | | | | | | | | | | | | | | | | ... library, this can lead to warnings or linker errors. Most easily seen on macOS when multiplexing across multiple architectures, and an app ends up linking against multiple multiplexed variants of a dependent product library. Change-Id: I4ea4b419099a1010f7b8c32ee11079da93f1d236 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Simplify installation of applications and librariesChristian Kandeler2018-06-014-104/+41
|/ | | | | | | | | | | | | | | | Add "install" and "installDir" convenience properties to our Application, DynamicLibrary and StaticLibrary items, so users are no longer required to write groups with file tag filters for the normal installation case. The installDir property has a suitable default value for the respective target platform, as does qbs.installPrefix. [ChangeLog] The Application, DynamicLibrary and StaticLibrary items now have properties for more convenient installation of target binaries. Task-number: QBS-229 Change-Id: I9cfa4c02a7c555b0af637257da63967cd62cc119 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Darwin: Fix lipo rulesChristian Kandeler2018-02-221-0/+32
| | | | | | | | | | - We must activate these rules only on the product that is the actual aggregator. - The lipo command must only consider artifacts of the multiplexed variants of the same product. Change-Id: I25dc42cb53d84d85786b2d7ff96297b7fd58a90d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Introduce cpp.rpathOriginJake Petroules2017-12-082-6/+6
| | | | | | | | [ChangeLog] Added property cpp.rpathOrigin which evaluates to @loader_path on Darwin and $ORIGIN on other Unix-like platforms. Change-Id: If5770a83ae32f29ee520fd00b07ed8f0caf6bd48 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix default deployment target of storyboard in assetcatalog testJake Petroules2017-11-131-1/+1
| | | | | | | It should be set to 'default deployment target'. Change-Id: I0022317044c72a5f1d27fe5a1cc902fb3901d2ce Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix assetcatalog test with newer versions of macOSJake Petroules2017-11-131-1/+3
| | | | | | | | | The default deployment target handling has since changed in a way such that we cannot assume the 'default' target is the current host version. Therefore, make the test explicit about the required deployment target. Change-Id: I2547c6051def619dba8b9e6f18b26942fc6707cd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Introduce property cpp.variantSuffixChristian Kandeler2017-09-011-0/+18
| | | | | | | | | | | | This property existed already, but was only used for Darwin. It is now fully functional and has proper platform-specific default values. [ChangeLog] Debug variants of libraries now get a name suffix on Darwin and Windows when multiplexing over qbs.buildVariants. Overriding is possible via cpp.variantSuffix. Change-Id: I5763f9641ead4f6335ab1f1800b9929bf84279e3 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix tests with older versions of Apple ClangJake Petroules2017-06-212-0/+5
| | | | | | | Amends and fixes a regression introduced in 4551d11. Change-Id: I8014c8bfb82c389d4ae741f868be45e420e327ca Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add support for building macOS disk imagesJake Petroules2017-06-1215-0/+174
| | | | | | | | | | | | | | | | This allows users to build drag 'n' drop installers with custom backgrounds, volume icons, and icon layouts. Unlike other solutions, disk images with these features can be built without any reliance on AppleScript, Finder, or a graphical login session, making it (mostly) reproducible and CI-friendly. .DS_Store files and their contained alias and bookmark records (which control the mounted disk image's appearance in the Finder) are written on-demand based on qbs properties defined in the project file, as well as the Carbon LPic, TEXT, styl, and RTF resources used for embedding a license agreement prompt. Task-number: QBS-416 Change-Id: I95431e21becc3bea075a1468d5271a41c38bbd04 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Refactor asset catalogs test for greater performance and coverageJake Petroules2017-06-092-681/+4668
| | | | | | | | | | | | | | | | | | | | | | This splits out assetCatalogsEmpty and assetCatalogsMultiple from the main assetCatalog test. They are not affected by the data axis of the main test, so this improves performance by not running each of them twice for no reason. It also increases coverage by running them on OSes < macOS 10.9 (which we still test with) as long as Xcode 5 is present. Further, the main assetCatalog test no longer has a hard requirement on macOS 10.9 either, and instead conditionally enables testing of asset catalogs based on the Xcode version (>= 5). This increases test coverage of XIB compilation with older Xcodes and OSes. The MainMenu.xib has been recreated in an old version of Xcode (4.6.3) so it is more broadly usable as a test artifact with older configurations. Tested on macOS 10.12.5 with Xcode 8.3.2, macOS 10.7.5 with Xcode 4.6.3, and macOS 10.8.5 with Xcode 5.1.1. Change-Id: Ifc5d1b0462fd94aa5f1d55727bc74af73e8b9272 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Migrate tests of Apple platforms/tools into new tst_blackboxapple targetJake Petroules2017-05-3056-0/+1686
This new test suite collects all the tests which test qbs' support for Apple platforms, Xcode, and related tools. Change-Id: I835e2d5bee46f1b4bb281c02b5b4ef814f196d7c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
View Lorry Controller Status