diff options
| author | Richard Weickelt <richard@weickelt.de> | 2019-07-01 22:04:06 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2019-07-08 13:43:43 +0000 |
| commit | 81041af9ac15f8a0d0a5b6ba2ce4aab98614c34c (patch) | |
| tree | 4e50449ed69a6ca97b919f08fff26012cf055e44 /scripts | |
| parent | 1ea9d32068ec143665af29c41d742847a0b28683 (diff) | |
Add Windows to Travis build config
This patch enables Qbs builds and autotests on Windows.
Builds in release mode to speed up test execution.
Change-Id: Iaddfddb3459266740aa18c06d431624336446c6b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-qbs-with-qbs.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/scripts/build-qbs-with-qbs.sh b/scripts/build-qbs-with-qbs.sh index 5956f1cff..503f3fbff 100755 --- a/scripts/build-qbs-with-qbs.sh +++ b/scripts/build-qbs-with-qbs.sh @@ -89,9 +89,16 @@ if [ -z "${QBS_AUTOTEST_PROFILE}" ]; then ${RUN_OPTIONS} \ "${QMAKE_PATH:-$(which qmake)}" ${QBS_AUTOTEST_PROFILE} - qbs run -p qbs_app ${BUILD_OPTIONS} -- config \ - ${RUN_OPTIONS} \ - ${QBS_AUTOTEST_PROFILE}.baseProfile gcc + # Make sure that the Qt profile uses the same toolchain profile + # that was used for building in case a custom QBS_BUILD_PROFILE + # was set. Otherwise setup-qt automatically uses the default + # toolchain profile. + if [ ! -z "${QBS_BUILD_PROFILE}" ]; then + QBS_BUILD_BASE_PROFILE=$(qbs config ${QBS_BUILD_PROFILE}.baseProfile | cut -d: -f2) + qbs run -p qbs_app ${BUILD_OPTIONS} -- config \ + ${RUN_OPTIONS} \ + ${QBS_AUTOTEST_PROFILE}.baseProfile ${QBS_BUILD_BASE_PROFILE} + fi # QBS_AUTOTEST_PROFILE has been added to the environment # which requires a resolve step |