Skip to content

RISC-V: Increase timeout for OpenJDK tests #4990

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

Merged
merged 3 commits into from
Jan 22, 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
5 changes: 5 additions & 0 deletions openjdk/openjdk.mk
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,17 @@ JTREG_BASIC_OPTIONS += -retain:fail,error,*.dmp,javacore.*,heapdump.*,*.trc
# Ignore tests are not run and completely silent about it
JTREG_IGNORE_OPTION = -ignore:quiet
JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION)
# riscv64 machines aren't very fast (yet!!)
ifeq ($(ARCH), riscv64)
JTREG_TIMEOUT_OPTION = -timeoutFactor:16
else
# Multiple by 8 the timeout numbers, except on zOS use 2
ifneq ($(OS),OS/390)
JTREG_TIMEOUT_OPTION = -timeoutFactor:8
else
JTREG_TIMEOUT_OPTION = -timeoutFactor:2
endif
endif
JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
# Create junit xml
JTREG_XML_OPTION = -xml:verify
Expand Down