Skip to content

Commit dbedba6

Browse files
committed
[CI] Fix regression when checking error
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 0830d9f commit dbedba6

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

CI/build/arduino-cli.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -495,20 +495,26 @@ def check_status(status, build_conf, boardKo):
495495
elif status[1] == 1:
496496
# Check if failed due to a region overflowed
497497
logFile = os.path.join(build_conf[3], sketch_name + ".log")
498+
error_pattern = re.compile(":\\d+:\\d+:\\serror:\\s")
498499
ld_pattern = re.compile("arm-none-eabi/bin/ld:")
499500
overflow_pattern = re.compile(
500501
"will not fit in region|region .+ overflowed by [\\d]+ bytes"
501502
)
503+
error_found = False
502504
for i, line in enumerate(open(logFile)):
503-
if ld_pattern.search(line):
505+
if error_pattern.search(line):
506+
error_found = True
507+
elif ld_pattern.search(line):
504508
# If one ld line is not for region overflowed --> failed
505509
if overflow_pattern.search(line) is None:
506-
result = "\033[31mfailed\033[0m "
507-
boardKo.append(build_conf[0])
508-
if args.ci:
509-
cat(logFile)
510-
nb_build_failed += 1
511-
break
510+
error_found = True
511+
if error_found:
512+
result = "\033[31mfailed\033[0m "
513+
boardKo.append(build_conf[0])
514+
if args.ci:
515+
cat(logFile)
516+
nb_build_failed += 1
517+
break
512518
else:
513519
# else consider it succeeded
514520
result = "\033[32msucceeded\033[0m"

0 commit comments

Comments
 (0)