@matheusbsbs / matheus-bagliano / commits / a8b8b6b87d

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>

SZEDER Gábor committed Dec 27, 2017 at 17:36 UTC a8b8b6b87dd027d6a6158c3589abca2c43a203a7
4 files changed +13 -1
ci/lib-travisci.sh
+3 -1
@@ -22,7 +22,9 @@ skip_branch_tip_with_tag () {
22 }
23
24 # Set 'exit on error' for all CI scripts to let the caller know that
25 -# something went wrong
25 +# something went wrong.
26 +# Set tracing executed commands, primarily setting environment variables
27 +# and installing dependencies.
28 set -ex
29
30 skip_branch_tip_with_tag
ci/print-test-failures.sh
+3
@@ -5,6 +5,9 @@
5
6 . ${0%/*}/lib-travisci.sh
7
8 +# Tracing executed commands would produce too much noise in the loop below.
9 +set +x
10 +
11 for TEST_EXIT in t/test-results/*.exit
12 do
13 if [ "$(cat "$TEST_EXIT")" != "0" ]
ci/run-linux32-build.sh
+2
@@ -6,6 +6,8 @@
6 # run-linux32-build.sh [host-user-id]
7 #
8
9 +set -x
10 +
11 # Update packages to the latest available versions
12 linux32 --32bit i386 sh -c '
13 apt update >/dev/null &&
ci/run-windows-build.sh
+5
@@ -69,6 +69,10 @@ esac
69
70 echo "Visual Studio Team Services Build #${BUILD_ID}"
71
72 +# Tracing execued commands would produce too much noise in the waiting
73 +# loop below.
74 +set +x
75 +
76 # Wait until build job finished
77 STATUS=
78 RESULT=
@@ -90,6 +94,7 @@ done
94 # Print log
95 echo ""
96 echo ""
97 +set -x
98 gfwci "action=log&buildId=$BUILD_ID" | cut -c 30-
99
100 # Set exit code for TravisCI