Skip to content

Commit 1a69886

Browse files
committed
[sanitizer] More sleep/repeat workarounds
1 parent 46f8051 commit 1a69886

File tree

1 file changed

+25
-13
lines changed

1 file changed

+25
-13
lines changed

zorg/buildbot/builders/sanitizers/buildbot_functions.sh

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -579,33 +579,45 @@ function check_stage3_ubsan {
579579
check_stage3 ubsan
580580
}
581581

582+
function buildbot_build() {
583+
[[ "${BUILDBOT_BISECT_MODE:-}" != "1" && -v BUILDBOT_BUILDERNAME ]]
584+
}
585+
582586
function build_failure() {
583587
# In bisect mode exit early.
584588
echo
585589
echo "How to reproduce locally: https://github.com/google/sanitizers/wiki/SanitizerBotReproduceBuild"
586590
echo
587591

588-
sleep 5
589-
echo "@@@STEP_FAILURE@@@"
590-
buildbot_build || exit 1
591-
}
592+
# Repeat, server sometimes ignores failures or warnings.
593+
for i in 0 1 2 ; do
594+
echo
595+
echo "@@@STEP_FAILURE@@@"
596+
sleep 5
597+
done
592598

593-
function buildbot_build() {
594-
[[ "${BUILDBOT_BISECT_MODE:-}" != "1" && -v BUILDBOT_BUILDERNAME ]]
599+
buildbot_build || exit 1
595600
}
596601

597602
function build_exception() {
598-
sleep 5
599-
echo "@@@STEP_EXCEPTION@@@"
603+
# Repeat, server sometimes ignores failures or warnings.
604+
for i in 0 1 2 ; do
605+
echo
606+
echo "@@@STEP_EXCEPTION@@@"
607+
sleep 5
608+
done
609+
600610
buildbot_build || exit 2
601611
}
602612

603613
function build_warning() {
604-
echo
605-
sleep 5
606-
echo "@@@STEP_WARNINGS@@@"
607-
echo
608-
sleep 5
614+
# Repeat, server sometimes ignores failures or warnings.
615+
for i in 0 1 2 ; do
616+
echo
617+
echo "@@@STEP_WARNINGS@@@"
618+
sleep 5
619+
done
620+
609621
buildbot_build || exit 2
610622
}
611623

0 commit comments

Comments
 (0)