From 9c42ed2d1491451dcc8cdb429ecf9ee46070054d Mon Sep 17 00:00:00 2001 From: David Goldblatt Date: Wed, 7 Jul 2021 15:16:38 -0700 Subject: [PATCH] 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. --- .travis.yml | 3 --- scripts/gen_travis.py | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) 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))