Skip to content

Commit a8b8b6b

Browse files
szedergitster
authored andcommitted
travis-ci: fine tune the use of 'set -x' in 'ci/*' scripts
The change in commit 4f26366 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4f26366 commit a8b8b6b

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

ci/lib-travisci.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ skip_branch_tip_with_tag () {
2222
}
2323

2424
# 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.
2628
set -ex
2729

2830
skip_branch_tip_with_tag

ci/print-test-failures.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
. ${0%/*}/lib-travisci.sh
77

8+
# Tracing executed commands would produce too much noise in the loop below.
9+
set +x
10+
811
for TEST_EXIT in t/test-results/*.exit
912
do
1013
if [ "$(cat "$TEST_EXIT")" != "0" ]

ci/run-linux32-build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# run-linux32-build.sh [host-user-id]
77
#
88

9+
set -x
10+
911
# Update packages to the latest available versions
1012
linux32 --32bit i386 sh -c '
1113
apt update >/dev/null &&

ci/run-windows-build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ esac
6969

7070
echo "Visual Studio Team Services Build #${BUILD_ID}"
7171

72+
# Tracing execued commands would produce too much noise in the waiting
73+
# loop below.
74+
set +x
75+
7276
# Wait until build job finished
7377
STATUS=
7478
RESULT=
@@ -90,6 +94,7 @@ done
9094
# Print log
9195
echo ""
9296
echo ""
97+
set -x
9398
gfwci "action=log&buildId=$BUILD_ID" | cut -c 30-
9499

95100
# Set exit code for TravisCI

0 commit comments

Comments
 (0)