Travis: Don't test "clang" on OS X.
On OS X, "gcc" is really just clang anyways, so this combination gets tested by the gcc test. This is purely redundant, and (since it runs early in the output) increases time to signal for real breakages further down in the list.
This commit is contained in:
parent
d202218e86
commit
9c42ed2d14
@ -53,9 +53,6 @@ matrix:
|
|||||||
- os: linux
|
- os: linux
|
||||||
arch: amd64
|
arch: amd64
|
||||||
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
|
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
|
- os: osx
|
||||||
arch: amd64
|
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"
|
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"
|
||||||
|
@ -87,6 +87,9 @@ def format_job(combination):
|
|||||||
'percpu_arena:percpu' in malloc_conf or 'background_thread:true' \
|
'percpu_arena:percpu' in malloc_conf or 'background_thread:true' \
|
||||||
in malloc_conf):
|
in malloc_conf):
|
||||||
return ""
|
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:
|
if len(malloc_conf) > 0:
|
||||||
configure_flags.append('--with-malloc-conf=' + ",".join(malloc_conf))
|
configure_flags.append('--with-malloc-conf=' + ",".join(malloc_conf))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user