Skip to content

Commit dc9f9e9

Browse files
committed
patch 8.1.1317: output from Travis can be improved
Problem: Output from Travis can be improved. Solution: Add section headers. Handle errors better. (closes vim#4098)
1 parent d689673 commit dc9f9e9

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

.travis.yml

+12-5
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ before_script:
130130
131131
script:
132132
- NPROC=$(getconf _NPROCESSORS_ONLN)
133+
- set -o errexit
134+
- echo -e "\\033[33;1mConfiguring Vim\\033[0m" && echo -en "travis_fold:start:configure\\r\\033[0K"
133135
- |
134136
if [[ "${CHECK_AUTOCONF}" = "yes" ]] && [[ "${CC}" = "gcc" ]]; then
135137
make -C src autoconf
@@ -138,13 +140,17 @@ script:
138140
if [[ -n "${SHADOWOPT}" ]]; then
139141
make -C src shadow
140142
fi
143+
# "./configure" changes its working directory into "$SRCDIR".
144+
- ./configure --with-features=${FEATURES} ${CONFOPT} --enable-fail-if-missing
145+
- echo -en "travis_fold:end:configure\\r\\033[0K"
146+
- echo -e "\\033[33;1mBuilding Vim\\033[0m" && echo -en "travis_fold:start:build\\r\\033[0K"
141147
- |
142-
(
143-
cd "${SRCDIR}" \
144-
&& ./configure --with-features=${FEATURES} ${CONFOPT} --enable-fail-if-missing
145-
) && if [[ "${BUILD}" = "yes" ]]; then
148+
if [[ "${BUILD}" = "yes" ]]; then
146149
make ${SHADOWOPT} -j${NPROC}
147150
fi
151+
- echo -en "travis_fold:end:build\\r\\033[0K"
152+
- set +o errexit
153+
- echo -e "\\033[33;1mTesting Vim\\033[0m" && echo -en "travis_fold:start:test\\r\\033[0K"
148154
# Show Vim version and also if_xx versions.
149155
- |
150156
if [[ "${BUILD}" = "yes" ]]; then
@@ -154,12 +160,13 @@ script:
154160
cat if_ver.txt
155161
fi
156162
- make ${SHADOWOPT} ${TEST}
163+
- echo -en "travis_fold:end:test\\r\\033[0K"
157164
- |
158165
if [[ -n "${ASAN_OPTIONS}" ]]; then
159166
while read log; do
160167
asan_symbolize < "${log}"
168+
false # exit 1 if there are ASAN logs
161169
done < <(find . -type f -name 'asan.*' -size +0)
162-
[[ -z "${log}" ]] # exit 1 if there are ASAN logs
163170
fi
164171
165172
after_success:

configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# This is just a stub for the Unix configure script, to provide support for
44
# doing "./configure" in the top Vim directory.
55

6-
cd src && exec ./configure "$@"
6+
cd "${SRCDIR:-src}" && exec ./configure "$@"

src/version.c

+2
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,8 @@ static char *(features[]) =
767767

768768
static int included_patches[] =
769769
{ /* Add new patch number below this line */
770+
/**/
771+
1317,
770772
/**/
771773
1316,
772774
/**/

0 commit comments

Comments
 (0)