diff --git a/.travis.yml b/.travis.yml index 6aea0581..5cf0e08e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,9 +53,6 @@ matrix: - os: linux arch: amd64 env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds" - - os: osx - arch: amd64 - env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="" EXTRA_CFLAGS="-Werror -Wno-array-bounds -Wno-unknown-warning-option -Wno-ignored-attributes -Wno-deprecated-declarations" - os: osx arch: amd64 env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="" EXTRA_CFLAGS="-Werror -Wno-array-bounds -Wno-unknown-warning-option -Wno-ignored-attributes -Wno-deprecated-declarations" diff --git a/scripts/gen_travis.py b/scripts/gen_travis.py index 992bf005..fe9d8403 100755 --- a/scripts/gen_travis.py +++ b/scripts/gen_travis.py @@ -87,6 +87,9 @@ def format_job(combination): 'percpu_arena:percpu' in malloc_conf or 'background_thread:true' \ in malloc_conf): return "" + # gcc is just a redirect to clang on OS X. No need to test both. + if os == 'osx' and compilers_unusual in combination: + return "" if len(malloc_conf) > 0: configure_flags.append('--with-malloc-conf=' + ",".join(malloc_conf))