Skip to content

Commit a5905e8

Browse files
committed
fix: apply agent suggestions
1 parent 53fb055 commit a5905e8

1 file changed

Lines changed: 22 additions & 1 deletion

File tree

utils/run-containers-tests.sh

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,11 +318,16 @@ skip_reason() {
318318
local libc=$1
319319
local jdk=$2
320320
local config=$3
321+
local arch=$4
321322

322323
if [[ "$libc" == "musl" && "$jdk" == *-j9 ]]; then
323324
echo "J9/OpenJ9 is not available for musl libc"
324325
elif [[ "$libc" == "musl" && "$jdk" == *-graal ]]; then
325326
echo "GraalVM is not available for musl libc"
327+
elif [[ "$jdk" == *-graal && "$config" == "asan" ]]; then
328+
echo "GraalVM is not compatible with ASan shadow memory ranges"
329+
elif [[ "$libc" == "glibc" && "$arch" == "aarch64" && ( "$jdk" == "8" || "$jdk" == "11" ) ]]; then
330+
echo "HotSpot 8/11 are skipped on glibc aarch64 in CI"
326331
elif [[ "$libc" == "musl" && ( "$config" == "asan" || "$config" == "tsan" ) ]]; then
327332
echo "sanitizer configs are filtered out for musl in CI"
328333
fi
@@ -525,6 +530,21 @@ print_failed_cells() {
525530
done
526531
}
527532

533+
print_skipped_cells() {
534+
local i has_skips=false
535+
536+
for ((i = 0; i < ${#MATRIX_CELL_LIBCS[@]}; i++)); do
537+
if [[ "${MATRIX_CELL_STATUSES[$i]}" == "skipped" ]]; then
538+
if ! $has_skips; then
539+
echo
540+
echo "Skipped cells:"
541+
has_skips=true
542+
fi
543+
echo "- jdk=${MATRIX_CELL_JDKS[$i]}, libc=${MATRIX_CELL_LIBCS[$i]}, arch=${MATRIX_CELL_ARCHES[$i]}, config=${MATRIX_CELL_CONFIGS[$i]}: ${MATRIX_CELL_REASONS[$i]}"
544+
fi
545+
done
546+
}
547+
528548
prepare_matrix_cells() {
529549
local libc arch jdk config reason
530550

@@ -544,7 +564,7 @@ prepare_matrix_cells() {
544564
for jdk in "${MATRIX_JDKS[@]}"; do
545565
for config in "${MATRIX_CONFIGS[@]}"; do
546566
((MATRIX_TOTAL += 1))
547-
reason=$(skip_reason "$libc" "$jdk" "$config")
567+
reason=$(skip_reason "$libc" "$jdk" "$config" "$arch")
548568
if [[ -n "$reason" ]]; then
549569
((MATRIX_SKIPPED += 1))
550570
MATRIX_CELL_STATUSES+=("skipped")
@@ -580,6 +600,7 @@ print_matrix_preview() {
580600
echo "Skipped cells: $MATRIX_SKIPPED"
581601
echo
582602
print_matrix_status_table emoji
603+
print_skipped_cells
583604
}
584605

585606
write_matrix_reports() {

0 commit comments

Comments
 (0)