X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=scripts%2Fci%2Frun-jenkins.sh;fp=scripts%2Fci%2Frun-jenkins.sh;h=fcc26b7eff6e02dcbe4470a76569be0cae8c8109;hb=5141dc7f2cdd4e45a3ad9cf9dd3dbe90c11005b5;hp=4eeedc730de5cb9b01d36713c73f501d2a5ff564;hpb=6a5fbca3d9dd7729036dfba512a35c396250cef5;p=mono.git

diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh
index 4eeedc730de..fcc26b7eff6 100755
--- a/scripts/ci/run-jenkins.sh
+++ b/scripts/ci/run-jenkins.sh
@@ -5,12 +5,23 @@ export TESTCMD=${MONO_REPO_ROOT}/scripts/ci/run-step.sh
 
 export TEST_HARNESS_VERBOSE=1
 
+make_timeout=300m
+
 if [[ $CI_TAGS == *'collect-coverage'* ]]; then
     # Collect coverage for further use by lcov and similar tools.
     # Coverage must be collected with -O0 and debug information.
     export CFLAGS="-ggdb3 --coverage -O0"
     # Collect coverage on all optimizations
     export MONO_ENV_OPTIONS="$MONO_ENV_OPTIONS -O=all"
+elif [[ ${CI_TAGS} == *'clang-sanitizer'* ]]; then
+	export CC="clang"
+	export CXX="clang++"
+	export CFLAGS="-g -O1 -fsanitize=thread -fsanitize-blacklist=${MONO_REPO_ROOT}/scripts/ci/clang-thread-sanitizer-blacklist -mllvm -tsan-instrument-atomics=false"
+	export LDFLAGS="-fsanitize=thread"
+	# TSAN_OPTIONS are used by programs that were compiled with Clang's ThreadSanitizer
+	# see https://github.com/google/sanitizers/wiki/ThreadSanitizerFlags for more details
+	export TSAN_OPTIONS="history_size=7:exitcode=0:force_seq_cst_atomics=1"
+	make_timeout=30m
 elif [[ ${label} == w* ]]; then
     # Passing -ggdb3 on Cygwin breaks linking against libmonosgen-x.y.dll
     export CFLAGS="-g -O2"
@@ -88,7 +99,7 @@ if [[ ${CI_TAGS} == *'monolite'* ]]; then make get-monolite-latest; fi
 make_parallelism=-j4
 if [[ ${label} == 'debian-8-ppc64el' ]]; then make_parallelism=-j1; fi
 
-${TESTCMD} --label=make --timeout=300m --fatal make ${make_parallelism} -w V=1
+${TESTCMD} --label=make --timeout=${make_timeout} --fatal make ${make_parallelism} -w V=1
 
 if [[ ${CI_TAGS} == *'checked-coop'* ]]; then export MONO_CHECK_MODE=gc,thread; fi
 if [[ ${CI_TAGS} == *'checked-all'* ]]; then export MONO_CHECK_MODE=all; fi