Mercurial > vim
changeset 20548:6564dafe5005 v8.2.0828
patch 8.2.0828: Travis: regexp patttern doesn't work everywhere
Commit: https://github.com/vim/vim/commit/92c098d18e435a7a762409744ebe2dbb3746ed77
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue May 26 20:09:11 2020 +0200
patch 8.2.0828: Travis: regexp patttern doesn't work everywhere
Problem: Travis: regexp patttern doesn't work everywhere.
Solution: Use [:blank:] instead of \b. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/6146)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 26 May 2020 20:15:04 +0200 |
| parents | 5e6b9042a775 |
| children | bb6d8e1cb40e |
| files | .travis.yml ci/config.mk.clang.sed ci/config.mk.gcc.sed ci/config.mk.sed src/if_ruby.c src/version.c |
| diffstat | 6 files changed, 24 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/.travis.yml +++ b/.travis.yml @@ -125,7 +125,12 @@ script: # Append various warning flags to CFLAGS. # BSD sed needs backup extension specified. sed -i.bak -f ci/config.mk.sed ${SRCDIR}/auto/config.mk - sed -i.bak -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk + if [[ "${TRAVIS_OS_NAME}" = "osx" ]]; then + # On macOS, the entity of gcc is clang. + sed -i.bak -f ci/config.mk.clang.sed ${SRCDIR}/auto/config.mk + else + sed -i.bak -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk + fi make ${SHADOWOPT} -j${NPROC} fi - echo -en "travis_fold:end:build\\r\\033[0K" @@ -141,11 +146,10 @@ script: - do_test make ${SHADOWOPT} ${TEST} && FOLD_MARKER=travis_fold - echo -en "${FOLD_MARKER}:end:test\\r\\033[0K" - -# instead of a 2*2*8 matrix (2*os + 2*compiler + 8*env), -# exclude some builds on mac os x and linux -# on mac os x "tiny" is always without GUI -# linux: 2*compiler + 5*env + mac: 2*compiler + 2*env +# Instead of using all environments with both compilers on both systems, +# exclude some builds on mac os x and linux. +# On mac os x "tiny" is always without GUI, use 2 compilers in 2 environments. +# Linux: 2 compilers on some of the environments + gcc on os390 jobs: include: - <<: *osx
--- a/ci/config.mk.clang.sed +++ b/ci/config.mk.clang.sed @@ -1,1 +1,2 @@ -/^RUBY_CFLAGS\b/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes/ +/^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=missing-field-initializers/ +/^RUBY_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes/
--- a/ci/config.mk.gcc.sed +++ b/ci/config.mk.gcc.sed @@ -1,1 +1,1 @@ -/^CFLAGS\b/s/$/ -Wno-error=maybe-uninitialized/ +/^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=maybe-uninitialized/
--- a/ci/config.mk.sed +++ b/ci/config.mk.sed @@ -1,2 +1,2 @@ -/^CFLAGS\b/s/$/ -Wall -Wextra -Wshadow -Werror/ -/^PERL_CFLAGS\b/s/$/ -Wno-error=unused-function/ +/^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Werror/ +/^PERL_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unused-function/
--- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -100,7 +100,8 @@ #endif // On macOS pre-installed Ruby defines "SIZEOF_TIME_T" as "SIZEOF_LONG" so it -// conflicts with the definition in config.h then causes macro-redifned warning. +// conflicts with the definition in config.h then causes a macro-redefined +// warning. #ifdef SIZEOF_TIME_T # undef SIZEOF_TIME_T #endif @@ -113,6 +114,11 @@ # include <st.h> // for ST_STOP and ST_CONTINUE #endif +// See above. +#ifdef SIZEOF_TIME_T +# undef SIZEOF_TIME_T +#endif + #undef off_t // ruby defines off_t as _int64, Mingw uses long #undef EXTERN #undef _