diff options
| author |  SZEDER Gábor <szeder.dev@gmail.com> | 2017-12-27 17:36:00 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-12-27 12:13:46 -0800 |
| commit | a8b8b6b87dd027d6a6158c3589abca2c43a203a7 (patch) | |
| tree | 4ffb00d94fbc4624ec83acd6477ca58dc564ffe7 /ci | |
| parent | travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output (diff) | |
| download | tgif-a8b8b6b87dd027d6a6158c3589abca2c43a203a7.tar.xz | |
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>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/lib-travisci.sh | 4 | ||||
| -rwxr-xr-x | ci/print-test-failures.sh | 3 | ||||
| -rwxr-xr-x | ci/run-linux32-build.sh | 2 | ||||
| -rwxr-xr-x | ci/run-windows-build.sh | 5 |
4 files changed, 13 insertions, 1 deletions
diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh index 331d3eb3a6..348fe3c3c1 100755 --- a/ci/lib-travisci.sh +++ b/ci/lib-travisci.sh @@ -22,7 +22,9 @@ skip_branch_tip_with_tag () { } # 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 skip_branch_tip_with_tag diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh index 8c8973cbf3..97cc059019 100755 --- a/ci/print-test-failures.sh +++ b/ci/print-test-failures.sh @@ -5,6 +5,9 @@ . ${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 do if [ "$(cat "$TEST_EXIT")" != "0" ] diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh index e30fb2cddc..a8518eddfb 100755 --- a/ci/run-linux32-build.sh +++ b/ci/run-linux32-build.sh @@ -6,6 +6,8 @@ # run-linux32-build.sh [host-user-id] # +set -x + # Update packages to the latest available versions linux32 --32bit i386 sh -c ' apt update >/dev/null && diff --git a/ci/run-windows-build.sh b/ci/run-windows-build.sh index 8757b3a97c..86999268a7 100755 --- a/ci/run-windows-build.sh +++ b/ci/run-windows-build.sh @@ -69,6 +69,10 @@ esac 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 STATUS= RESULT= @@ -90,6 +94,7 @@ done # Print log echo "" echo "" +set -x gfwci "action=log&buildId=$BUILD_ID" | cut -c 30- # Set exit code for TravisCI |