diff options
| author | Richard Weickelt <richard@weickelt.de> | 2019-06-21 04:08:25 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2019-07-01 17:18:21 +0000 |
| commit | acd61329b2401f8004254a062b325bd2dc4d150b (patch) | |
| tree | cb74431a9c7c68756f6937479458788aa352af44 /scripts | |
| parent | 9478d40f443f8354cbd048477301378dd9436054 (diff) | |
Add macOS in Travis build config
This patch enables Qbs builds and autotests on macOS X.
Address sanitizer has to be disabled because it slows
autotests down too much.
Change-Id: Id8b5ec4284881c8c7a4ac3ef612e979f10f67e1b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-qbs-with-qbs.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/scripts/build-qbs-with-qbs.sh b/scripts/build-qbs-with-qbs.sh index 0ebc440ae..15a4649b5 100755 --- a/scripts/build-qbs-with-qbs.sh +++ b/scripts/build-qbs-with-qbs.sh @@ -50,15 +50,12 @@ export LSAN_OPTIONS="suppressions=$( cd "$(dirname "$0")" ; pwd -P )/address-san # BUILD_OPTIONS="\ ${QBS_BUILD_PROFILE:+profile:${QBS_BUILD_PROFILE}} \ + modules.qbsbuildconfig.enableAddressSanitizer:true \ modules.qbsbuildconfig.enableProjectFileUpdates:true \ modules.qbsbuildconfig.enableUnitTests:true \ + ${BUILD_OPTIONS} " -WITH_ASAN=${WITH_ASAN:-1} -if [ "$WITH_ASAN" -ne 0 ]; then - BUILD_OPTIONS="$BUILD_OPTIONS modules.qbsbuildconfig.enableAddressSanitizer:true" -fi - # # Build all default products of Qbs # |