Skip to content

Commit 604a052

Browse files
LongyuZhangpshipton
authored andcommitted
Increase aarch linux jtreg timeout option
Increase aarch linux jtreg timeout option. Signed-off-by: LongyuZhang <[email protected]>
1 parent de802c7 commit 604a052

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

openjdk/openjdk.mk

+7-5
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,16 @@ JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION)
112112
# riscv64 machines aren't very fast (yet!!)
113113
ifeq ($(ARCH), riscv64)
114114
JTREG_TIMEOUT_OPTION = -timeoutFactor:16
115-
else
115+
# aarch64 linux requires extra time, set timeoutFactor to 12
116+
else ifneq ($(filter linux_aarch64, $(SPEC)),)
117+
JTREG_TIMEOUT_OPTION = -timeoutFactor:12
116118
# Multiple by 8 the timeout numbers, except on zOS use 2
117-
ifneq ($(OS),OS/390)
118-
JTREG_TIMEOUT_OPTION = -timeoutFactor:8
119-
else
119+
else ifeq ($(OS),OS/390)
120120
JTREG_TIMEOUT_OPTION = -timeoutFactor:2
121+
else
122+
JTREG_TIMEOUT_OPTION = -timeoutFactor:8
121123
endif
122-
endif
124+
123125
JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
124126
# Create junit xml
125127
JTREG_XML_OPTION = -xml:verify

0 commit comments

Comments
 (0)