From: Alexander Köplinger Date: Wed, 18 May 2016 15:18:38 +0000 (+0200) Subject: Merge pull request #3011 from akoeplinger/ci-fixes X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=4cbd7a6ab66010860db5f7cc9fbd6edb27c8a216;hp=9c351d5028d37c81443bf375c75640b986319907;p=mono.git Merge pull request #3011 from akoeplinger/ci-fixes [ci] Move setting CFLAGS and MONO_CHECK_MODE into the run-jenkins.sh script --- diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index eebaaffcea7..8b689458edb 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -3,8 +3,9 @@ TESTCMD=`dirname "${BASH_SOURCE[0]}"`/run-step.sh export TEST_HARNESS_VERBOSE=1 +export CFLAGS=-ggdb3 -if [[ ${CI_TAGS} == *'coop-gc'* ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-cooperative-gc=yes"; fi +if [[ ${CI_TAGS} == *'coop-gc'* ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-cooperative-gc=yes"; export MONO_CHECK_MODE=gc,thread; fi if [[ ${label} == 'osx-i386' ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-libgdiplus=/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib --enable-nls=no --build=i386-apple-darwin11.2.0"; fi if [[ ${label} == 'osx-amd64' ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-libgdiplus=/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib --enable-nls=no"; fi