Skip to content

Commit 9ee2194

Browse files
committed
Print integration test command output/error in CI.
1 parent 4976755 commit 9ee2194

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

metafix/integrationTest.sh

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ function parse_boolean() {
2828
parse_boolean "$METAFIX_DISABLE_TO_DO" && disable_todo=1 || disable_todo=
2929
parse_boolean "$METAFIX_INTEGRATION_TEST_PROFILE" && noprofile= || noprofile=no
3030
parse_boolean "$METAFIX_KEEP_TEMP" && keep_temp=1 || keep_temp=
31+
parse_boolean "$CI" && ci=1 || ci=
3132

3233
[ -t 1 -a -x /usr/bin/colordiff ] && colordiff=colordiff || colordiff=cat
3334

@@ -122,11 +123,23 @@ function get_file() {
122123
return 1
123124
}
124125

126+
function log_file() {
127+
if [ -s "$1" ]; then
128+
log "$2$1"
129+
130+
if [ "$3" -ne 0 -a -n "$ci" ]; then
131+
cat "$1"
132+
fi
133+
else
134+
rm_temp "$1"
135+
fi
136+
}
137+
125138
function command_info() {
126139
log " ${color_info}${1^} command exit status$color_reset: $2"
127140

128-
[ -s "$3" ] && log " ${color_info}${1^} command output$color_reset: $3" || rm_temp "$3"
129-
[ -s "$4" ] && log " ${color_info}${1^} command error$color_reset: $4" || rm_temp "$4"
141+
log_file "$3" " ${color_info}${1^} command output$color_reset: " "$2"
142+
log_file "$4" " ${color_info}${1^} command error$color_reset: " "$2"
130143

131144
log
132145
}

0 commit comments

Comments
 (0)