Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase aarch linux jtreg timeout option #5781

Merged
merged 1 commit into from
Dec 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions openjdk/openjdk.mk
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,16 @@ JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION)
# riscv64 machines aren't very fast (yet!!)
ifeq ($(ARCH), riscv64)
JTREG_TIMEOUT_OPTION = -timeoutFactor:16
else
# aarch64 linux requires extra time, set timeoutFactor to 12
else ifneq ($(filter linux_aarch64, $(SPEC)),)
JTREG_TIMEOUT_OPTION = -timeoutFactor:12
# Multiple by 8 the timeout numbers, except on zOS use 2
ifneq ($(OS),OS/390)
JTREG_TIMEOUT_OPTION = -timeoutFactor:8
else
else ifeq ($(OS),OS/390)
JTREG_TIMEOUT_OPTION = -timeoutFactor:2
else
JTREG_TIMEOUT_OPTION = -timeoutFactor:8
endif
endif

JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
# Create junit xml
JTREG_XML_OPTION = -xml:verify
Expand Down
Loading