diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-19 06:52:54 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-19 06:52:54 +0000 |
| commit | 4863a93d58fa6ee28682123a9a198956602b7823 (patch) | |
| tree | 5a837d33a30566ffb317917cf6291b9cbcaf7f83 | |
| parent | 6bdca5d85e15420082ac2e79f4bae1ff7bc5edbc (diff) | |
.travis.yml: use dedicated flags
* .travis.yml: use dedicated flags, cflags and others, not to
override optflags, warnflags and debugflags.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | .travis.yml | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 7eb6e02e34..360e12009d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -115,14 +115,14 @@ env: <<: *cron-only <<: *make-test-only env: - - "CFLAGS=-DVM_CHECK_MODE=0x0003" + - "cppflags=-DVM_CHECK_MODE=0x0003" - &FIBER_USE_sjlj name: FIBER_USE_NATIVE=0 <<: *linux <<: *cron-only env: - - "CFLAGS=-DFIBER_USE_NATIVE=0" + - "cppflags=-DFIBER_USE_NATIVE=0" - &TOKEN_THREADED_CODE name: TOKEN_THREADED_CODE @@ -130,7 +130,7 @@ env: <<: *cron-only <<: *make-test-only env: - - "CFLAGS=-DOPT_THREADED_CODE=1" + - "cppflags=-DOPT_THREADED_CODE=1" - &CALL_THREADED_CODE name: CALL_THREADED_CODE @@ -138,7 +138,7 @@ env: <<: *cron-only <<: *make-test-only env: - - "CFLAGS=-DOPT_THREADED_CODE=2" + - "cppflags=-DOPT_THREADED_CODE=2" - &NO_THREADED_CODE name: NO_THREADED_CODE @@ -146,7 +146,7 @@ env: <<: *cron-only <<: *make-test-only env: - - "CFLAGS=-DOPT_THREADED_CODE=3" + - "cppflags=-DOPT_THREADED_CODE=3" - &ASAN name: -fsanitize=address @@ -156,7 +156,9 @@ env: compiler: clang env: - "ASAN_OPTIONS=detect_leaks=0" - - "CFLAGS='-ggdb3 -O1 -march=native -fsanitize=address -fno-omit-frame-pointer'" + - "cflags='-march=native -fsanitize=address -fno-omit-frame-pointer'" + - "debugflags=-ggdb3" + - "optflags='-O1'" - "LD=clang" - "LDFLAGS=-fsanitize=address" @@ -167,7 +169,7 @@ env: <<: *make-test-only compiler: clang env: - - "CFLAGS='-fsanitize=memory'" + - "cflags='-fsanitize=memory'" - "LD=clang" - "LDFLAGS=-fsanitize=memory" @@ -178,7 +180,10 @@ env: <<: *make-test-only compiler: clang env: - - "CFLAGS='-ggdb3 -O1 -march=native -fsanitize=undefined,integer,nullability -fno-omit-frame-pointer -DUNALIGNED_WORD_ACCESS=0'" + - "cflags='-fsanitize=undefined,integer,nullability -fno-omit-frame-pointer'" + - "cppflags='-DUNALIGNED_WORD_ACCESS=0'" + - "debugflags='-ggdb3'" + - "optflags='-O1 -march=native'" - "LD=clang" - "LDFLAGS=-fsanitize=undefined,integer,nullability" @@ -188,7 +193,7 @@ env: sudo: required env: - "GCC_FLAGS=-m32" - - "CONFIG_FLAG='debugflags=-g0'" + - "debugflags='-g0'" - "SETARCH='setarch i686 --verbose --3gb'" addons: apt: @@ -249,8 +254,8 @@ env: -Wno-unused-parameter -Wunused-variable ) + warnflags="${warnflags_array[*]}" CONFIG_FLAG_ARRAY=( - warnflags="${warnflags_array[*]}" LDFLAGS=-Wno-unused-command-line-argument) - &rubyspec @@ -309,10 +314,8 @@ matrix: before_script: - "echo JOBS=${JOBS} SETARCH=${SETARCH}" - - |- - if [ ! -z "$CFLAGS" ]; then - CFLAGS="$CFLAGS -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-packed-bitfield-compat -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wno-unknown-warning-option" - fi + - warnflags="$warnflags${warnflags:+ }-Wno-unknown-warning-option" + - export warnflags - "$SETARCH uname -a" - "$SETARCH uname -r" - "rm -fr .ext autom4te.cache" |