зеркало из https://github.com/microsoft/git.git
travis-ci: fine tune the use of 'set -x' in 'ci/*' scripts
The change in commit 4f2636667
(travis-ci: use 'set -x' in 'ci/*'
scripts for extra tracing output, 2017-12-12) left a couple of rough
edges:
- 'ci/run-linux32-build.sh' is executed in a Docker container and
therefore doesn't source 'ci/lib-travisci.sh', which would enable
tracing executed commands. Enable 'set -x' in this script, too.
- 'ci/print-test-failures.sh' iterates over all the files containing
the exit codes of all the executed test scripts. Since there are
over 800 such files, the loop produces way too much noise with
tracing executed commands enabled, so disable 'set -x' for this
script.
- 'ci/run-windows-build.sh' busily waits in a loop for the result of
the Windows build, producing too much noise with tracing executed
commands enabled as well. Disable 'set -x' for the duration of
that loop.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
4f26366679
Коммит
a8b8b6b87d
|
@ -22,7 +22,9 @@ skip_branch_tip_with_tag () {
|
||||||
}
|
}
|
||||||
|
|
||||||
# Set 'exit on error' for all CI scripts to let the caller know that
|
# Set 'exit on error' for all CI scripts to let the caller know that
|
||||||
# something went wrong
|
# something went wrong.
|
||||||
|
# Set tracing executed commands, primarily setting environment variables
|
||||||
|
# and installing dependencies.
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
skip_branch_tip_with_tag
|
skip_branch_tip_with_tag
|
||||||
|
|
|
@ -5,6 +5,9 @@
|
||||||
|
|
||||||
. ${0%/*}/lib-travisci.sh
|
. ${0%/*}/lib-travisci.sh
|
||||||
|
|
||||||
|
# Tracing executed commands would produce too much noise in the loop below.
|
||||||
|
set +x
|
||||||
|
|
||||||
for TEST_EXIT in t/test-results/*.exit
|
for TEST_EXIT in t/test-results/*.exit
|
||||||
do
|
do
|
||||||
if [ "$(cat "$TEST_EXIT")" != "0" ]
|
if [ "$(cat "$TEST_EXIT")" != "0" ]
|
||||||
|
|
|
@ -6,6 +6,8 @@
|
||||||
# run-linux32-build.sh [host-user-id]
|
# run-linux32-build.sh [host-user-id]
|
||||||
#
|
#
|
||||||
|
|
||||||
|
set -x
|
||||||
|
|
||||||
# Update packages to the latest available versions
|
# Update packages to the latest available versions
|
||||||
linux32 --32bit i386 sh -c '
|
linux32 --32bit i386 sh -c '
|
||||||
apt update >/dev/null &&
|
apt update >/dev/null &&
|
||||||
|
|
|
@ -69,6 +69,10 @@ esac
|
||||||
|
|
||||||
echo "Visual Studio Team Services Build #${BUILD_ID}"
|
echo "Visual Studio Team Services Build #${BUILD_ID}"
|
||||||
|
|
||||||
|
# Tracing execued commands would produce too much noise in the waiting
|
||||||
|
# loop below.
|
||||||
|
set +x
|
||||||
|
|
||||||
# Wait until build job finished
|
# Wait until build job finished
|
||||||
STATUS=
|
STATUS=
|
||||||
RESULT=
|
RESULT=
|
||||||
|
@ -90,6 +94,7 @@ done
|
||||||
# Print log
|
# Print log
|
||||||
echo ""
|
echo ""
|
||||||
echo ""
|
echo ""
|
||||||
|
set -x
|
||||||
gfwci "action=log&buildId=$BUILD_ID" | cut -c 30-
|
gfwci "action=log&buildId=$BUILD_ID" | cut -c 30-
|
||||||
|
|
||||||
# Set exit code for TravisCI
|
# Set exit code for TravisCI
|
||||||
|
|
Загрузка…
Ссылка в новой задаче