summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wray <jason@mapbox.com>2017-12-18 16:58:52 -0800
committerJason Wray <jason@mapbox.com>2018-03-26 16:25:07 -0400
commit4b8c27edef8c87c00ef6e5be556f8a803723a5c0 (patch)
treed3a6ccfda911f3b60db3628f7cdcb5b23ba1e121
parent9a663fb4799bedb85ca583d7f23a1a67277d220b (diff)
downloadqtlocation-mapboxgl-4b8c27edef8c87c00ef6e5be556f8a803723a5c0.tar.gz
[ios, build] Run undefined behavior sanitizer on CircleCI
-rw-r--r--Makefile8
-rw-r--r--circle.yml14
2 files changed, 11 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 862201d8d1..8ba07366a2 100644
--- a/Makefile
+++ b/Makefile
@@ -235,14 +235,14 @@ ios-test: $(IOS_PROJ_PATH)
ios-integration-test: $(IOS_PROJ_PATH)
set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'Integration Test Harness' test $(XCPRETTY)
+.PHONY: ios-sanitize
+ios-sanitize: $(IOS_PROJ_PATH)
+ set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'CI' -enableThreadSanitizer YES -enableUndefinedBehaviorSanitizer YES test $(XCPRETTY)
+
.PHONY: ios-sanitize-address
ios-sanitize-address: $(IOS_PROJ_PATH)
set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'CI' -enableAddressSanitizer YES test $(XCPRETTY)
-.PHONY: ios-sanitize-thread
-ios-sanitize-thread: $(IOS_PROJ_PATH)
- set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'CI' -enableThreadSanitizer YES test $(XCPRETTY)
-
.PHONY: ipackage
ipackage: $(IOS_PROJ_PATH)
FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \
diff --git a/circle.yml b/circle.yml
index 3f67f8f6e6..3b85eaaf31 100644
--- a/circle.yml
+++ b/circle.yml
@@ -32,8 +32,8 @@ workflows:
- linux-gcc5-release-qt4
- linux-gcc5-release-qt5
- ios-debug
+ - ios-sanitize
#- ios-sanitize-address
- - ios-sanitize-thread
- ios-release:
filters:
tags:
@@ -732,7 +732,7 @@ jobs:
- *save-cache
# ------------------------------------------------------------------------------
- ios-sanitize-address:
+ ios-sanitize:
macos:
xcode: "9.2.0"
environment:
@@ -745,13 +745,13 @@ jobs:
- *restore-cache
- *reset-ccache-stats
- run:
- name: Build and run SDK unit tests with address sanitizer
- command: make ios-sanitize-address
+ name: Build and run SDK unit tests with thread and undefined behavior sanitizers
+ command: make ios-sanitize
- *show-ccache-stats
- *save-cache
# ------------------------------------------------------------------------------
- ios-sanitize-thread:
+ ios-sanitize-address:
macos:
xcode: "9.2.0"
environment:
@@ -764,8 +764,8 @@ jobs:
- *restore-cache
- *reset-ccache-stats
- run:
- name: Build and run SDK unit tests with thread sanitizer
- command: make ios-sanitize-thread
+ name: Build and run SDK unit tests with address sanitizer
+ command: make ios-sanitize-address
- *show-ccache-stats
- *save-cache