summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2017-03-17 16:58:59 +0300
committerIvan Maidanski <ivmai@mail.ru>2017-03-17 16:58:59 +0300
commita83901c82024720a54bdcf8ab4befa5142573c21 (patch)
tree0a4d521f9b51155711e728582e758bd64bbfc361
parent21b68ca057bf488198050471e1059fe72bb42985 (diff)
downloadbdwgc-a83901c82024720a54bdcf8ab4befa5142573c21.tar.gz
Travis CI: Do not test --enable-redirect with threads on 32-bit and Darwin
(fix commit c62abbb)
-rw-r--r--.travis.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index e84865a2..2d84f4ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ env:
- CONF_LARGE_CONFIG=--enable-large-config CFLAGS_EXTRA_M=-m32
- CONF_LARGE_CONFIG=--enable-large-config CONF_M_UNMAP=--enable-munmap
- CONF_REDIRECT=--enable-redirect-malloc CFLAGS_EXTRA_M=-m32
+ CONF_THREADS=--disable-threads
- CONF_REDIRECT=--enable-redirect-malloc CONF_GC_DEBUG=--enable-gc-debug
CONF_ASSERTIONS=--enable-gc-assertions
- CONF_STATIC=--disable-static CONF_THREADS=--disable-threads
@@ -75,9 +76,10 @@ matrix:
env: CONF_LARGE_CONFIG=--enable-large-config CFLAGS_EXTRA_M=-m32
- compiler: clang
env: CONF_LARGE_CONFIG=--enable-large-config CONF_M_UNMAP=--enable-munmap
- - compiler: clang
- env: CONF_REDIRECT=--enable-redirect-malloc CFLAGS_EXTRA_M=-m32
- compiler: gcc
+ env: CONF_REDIRECT=--enable-redirect-malloc CFLAGS_EXTRA_M=-m32
+ CONF_THREADS=--disable-threads
+ - compiler: clang
env: CONF_REDIRECT=--enable-redirect-malloc
CONF_GC_DEBUG=--enable-gc-debug
CONF_ASSERTIONS=--enable-gc-assertions