projects / platform / upstream / libgc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 21b68ca)
Travis CI: Do not test --enable-redirect with threads on 32-bit and Darwin
authorIvan Maidanski <ivmai@mail.ru>
Fri, 17 Mar 2017 13:58:59 +0000 (16:58 +0300)
committerIvan Maidanski <ivmai@mail.ru>
Fri, 17 Mar 2017 13:58:59 +0000 (16:58 +0300)
(fix commit c62abbb)

.travis.yml patch | blob | history

diff --git a/.travis.yml b/.travis.yml
index e84865a..2d84f4c 100644 (file)
--- 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
Domain: System / Toolchain;