GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-15 16:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 8.2.0828: Travis: regexp patttern doesn't work everywhere

Browse Source 
Problem:    Travis: regexp patttern doesn't work everywhere.
Solution:   Use [:blank:] instead of \b. (Ozaki Kiichi, closes #6146)
This commit is contained in:
Bram Moolenaar
2020-05-26 20:09:11 +02:00
parent 285b189260
commit 92c098d18e
6 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@ -125,7 +125,12 @@ script:
# Append various warning flags to CFLAGS. # Append various warning flags to CFLAGS.
# BSD sed needs backup extension specified. # 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.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} make ${SHADOWOPT} -j${NPROC}
fi fi
- echo -en "travis_fold:end:build\\r\\033[0K" - echo -en "travis_fold:end:build\\r\\033[0K"
@ -141,11 +146,10 @@ script:
- do_test make ${SHADOWOPT} ${TEST} && FOLD_MARKER=travis_fold - do_test make ${SHADOWOPT} ${TEST} && FOLD_MARKER=travis_fold
- echo -en "${FOLD_MARKER}:end:test\\r\\033[0K" - echo -en "${FOLD_MARKER}:end:test\\r\\033[0K"
# Instead of using all environments with both compilers on both systems,
# instead of a 2*2*8 matrix (2*os + 2*compiler + 8*env), # exclude some builds on mac os x and linux.
# exclude some builds on mac os x and linux # On mac os x "tiny" is always without GUI, use 2 compilers in 2 environments.
# on mac os x "tiny" is always without GUI # Linux: 2 compilers on some of the environments + gcc on os390
# linux: 2*compiler + 5*env + mac: 2*compiler + 2*env
jobs: jobs:
include: include:
- <<: *osx - <<: *osx

3
ci/config.mk.clang.sed
View File

@ -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/

2
ci/config.mk.gcc.sed
View File

@ -1 +1 @@
/^CFLAGS\b/s/$/ -Wno-error=maybe-uninitialized/ /^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=maybe-uninitialized/

4
ci/config.mk.sed
View File

@ -1,2 +1,2 @@
/^CFLAGS\b/s/$/ -Wall -Wextra -Wshadow -Werror/ /^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Werror/
/^PERL_CFLAGS\b/s/$/ -Wno-error=unused-function/ /^PERL_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unused-function/

8
src/if_ruby.c
View File

@ -100,7 +100,8 @@
#endif #endif
// On macOS pre-installed Ruby defines "SIZEOF_TIME_T" as "SIZEOF_LONG" so it // 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 #ifdef SIZEOF_TIME_T
# undef SIZEOF_TIME_T # undef SIZEOF_TIME_T
#endif #endif
@ -113,6 +114,11 @@
# include <st.h> // for ST_STOP and ST_CONTINUE # include <st.h> // for ST_STOP and ST_CONTINUE
#endif #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 off_t // ruby defines off_t as _int64, Mingw uses long
#undef EXTERN #undef EXTERN
#undef _ #undef _

2
src/version.c
View File

@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
828,
/**/ /**/
827, 827,
/**/ /**/