author | roland |
Tue, 22 Oct 2019 11:55:58 +0200 | |
changeset 58960 | f79a8217d4c9 |
parent 58549 | 9d9317fad3fe |
child 58679 | 9c3209ff7550 |
permissions | -rw-r--r-- |
48078 | 1 |
# |
53172
6bc1f8d41f4f
8216021: RunTest.gmk might set concurrency level to 1 on Windows
erikj
parents:
52593
diff
changeset
|
2 |
# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. |
48078 | 3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
# |
|
5 |
# This code is free software; you can redistribute it and/or modify it |
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
|
7 |
# published by the Free Software Foundation. Oracle designates this |
|
8 |
# particular file as subject to the "Classpath" exception as provided |
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
|
10 |
# |
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
# accompanied this code). |
|
16 |
# |
|
17 |
# You should have received a copy of the GNU General Public License version |
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
# |
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
# or visit www.oracle.com if you need additional information or have any |
|
23 |
# questions. |
|
24 |
# |
|
25 |
||
26 |
################################################################################ |
|
27 |
# Initial bootstrapping, copied and stripped down from Makefile and Init.gmk |
|
28 |
################################################################################ |
|
29 |
||
30 |
# In Cygwin, the MAKE variable gets prepended with the current directory if the |
|
31 |
# make executable is called using a Windows mixed path (c:/cygwin/bin/make.exe). |
|
32 |
ifneq ($(findstring :, $(MAKE)), ) |
|
33 |
export MAKE := $(patsubst $(CURDIR)%, %, $(patsubst $(CURDIR)/%, %, $(MAKE))) |
|
34 |
endif |
|
35 |
||
36 |
# Locate this Makefile |
|
37 |
ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))),) |
|
38 |
makefile_path := $(CURDIR)/$(strip $(lastword $(MAKEFILE_LIST))) |
|
39 |
else |
|
40 |
makefile_path := $(lastword $(MAKEFILE_LIST)) |
|
41 |
endif |
|
42 |
TOPDIR := $(strip $(patsubst %/make/, %, $(dir $(makefile_path)))) |
|
43 |
||
44 |
################################################################################ |
|
45 |
# Functions |
|
46 |
################################################################################ |
|
47 |
||
48 |
# Setup a required or optional variable, and/or check that it is properly |
|
49 |
# given. |
|
50 |
# Note: No spaces are allowed around the arguments. |
|
51 |
# |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
52 |
# $1: The name of the variable |
48078 | 53 |
# $2: The default value, if any, or OPTIONAL (do not provide a default but |
54 |
# do not exit if it is missing) |
|
55 |
# $3: If NO_CHECK, disable checking for target file/directory existence |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
56 |
# If MKDIR, create the default directory |
48078 | 57 |
define SetupVariable |
58 |
ifeq ($$($1), ) |
|
59 |
ifeq ($2, ) |
|
60 |
$$(info Error: Prebuilt variable $1 is missing, needed for run-tests-prebuilt) |
|
61 |
$$(error Cannot continue.) |
|
62 |
else ifeq ($2, OPTIONAL) |
|
63 |
ifneq ($$(findstring $$(LOG), info debug trace), ) |
|
64 |
$$(info Prebuilt variable $1 is not provided) |
|
65 |
endif |
|
66 |
else |
|
67 |
ifneq ($$(findstring $$(LOG), info debug trace), ) |
|
68 |
$$(info Prebuilt variable $1=$2 (default value)) |
|
69 |
endif |
|
70 |
$1:=$2 |
|
71 |
endif |
|
72 |
else |
|
73 |
ifneq ($$(findstring $$(LOG), info debug trace), ) |
|
74 |
$$(info Prebuilt variable $1=$$($1)) |
|
75 |
endif |
|
76 |
endif |
|
77 |
# If $1 has a value (is not optional), and $3 is not set (to NO_CHECK), |
|
78 |
# and if wildcard is empty, then complain that the file is missing. |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
79 |
ifeq ($3, MKDIR) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
80 |
ifneq ($$(findstring $$(LOG), info debug trace), ) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
81 |
$$(info Creating directory for $1) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
82 |
endif |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
83 |
$$(shell mkdir -p $$($1)) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
84 |
else ifneq ($3, NO_CHECK) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
85 |
ifeq ($$(strip $$(if $$($1), , OPTIONAL) $$(wildcard $$($1))), ) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
86 |
$$(info Error: Prebuilt variable $1 points to missing file/directory:) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
87 |
$$(info '$$($1)') |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
88 |
$$(error Cannot continue.) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
89 |
endif |
48078 | 90 |
endif |
91 |
endef |
|
92 |
||
93 |
# Create an ephemeral spec file |
|
94 |
# |
|
95 |
# $1: The output file name |
|
96 |
# $2..$N: The lines to output to the file |
|
97 |
define CreateNewSpec |
|
53526
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53460
diff
changeset
|
98 |
$(if $(strip $(33)), \ |
48078 | 99 |
$(error Internal makefile error: \ |
100 |
Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \ |
|
101 |
) \ |
|
102 |
$(shell $(RM) $1) \ |
|
53526
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53460
diff
changeset
|
103 |
$(foreach i, $(call sequence, 2, 32), \ |
48078 | 104 |
$(if $(strip $($i)), \ |
105 |
$(call AppendFile, $(strip $($i)), $1) \ |
|
106 |
) \ |
|
107 |
) |
|
108 |
endef |
|
109 |
||
110 |
################################################################################ |
|
111 |
# Check input and setup basic buildsystem support |
|
112 |
################################################################################ |
|
113 |
||
114 |
# Verify that user has given correct additional input. |
|
115 |
||
116 |
# These variables are absolutely necessary |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
117 |
$(eval $(call SetupVariable,OUTPUTDIR,$(TOPDIR)/build/run-test-prebuilt,MKDIR)) |
48078 | 118 |
$(eval $(call SetupVariable,BOOT_JDK)) |
119 |
$(eval $(call SetupVariable,JT_HOME)) |
|
120 |
||
121 |
# These can have default values based on the ones above |
|
122 |
$(eval $(call SetupVariable,JDK_IMAGE_DIR,$(OUTPUTDIR)/images/jdk)) |
|
123 |
$(eval $(call SetupVariable,TEST_IMAGE_DIR,$(OUTPUTDIR)/images/test)) |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
124 |
$(eval $(call SetupVariable,SYMBOLS_IMAGE_DIR,$(OUTPUTDIR)/images/symbols,NO_CHECK)) |
48078 | 125 |
|
126 |
# Provide default values for tools that we need |
|
127 |
$(eval $(call SetupVariable,MAKE,make,NO_CHECK)) |
|
128 |
$(eval $(call SetupVariable,BASH,bash,NO_CHECK)) |
|
129 |
||
130 |
# Check optional variables |
|
131 |
$(eval $(call SetupVariable,JIB_JAR,OPTIONAL)) |
|
132 |
||
133 |
# Now that we have verified that we have the required variables available, we |
|
134 |
# can include the prebuilt spec file ourselves, without an ephemeral spec |
|
135 |
# wrapper. This is required so we can include MakeBase which is needed for |
|
136 |
# CreateNewSpec. |
|
137 |
HAS_SPEC := |
|
138 |
include $(TOPDIR)/make/InitSupport.gmk |
|
139 |
||
140 |
$(eval $(call CheckDeprecatedEnvironment)) |
|
141 |
$(eval $(call CheckInvalidMakeFlags)) |
|
142 |
$(eval $(call ParseLogLevel)) |
|
143 |
||
144 |
SPEC := $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk |
|
145 |
include $(SPEC) |
|
146 |
include $(TOPDIR)/make/common/MakeBase.gmk |
|
147 |
||
148 |
################################################################################ |
|
149 |
# Determine what platform we're running on |
|
150 |
################################################################################ |
|
151 |
UNAME := uname |
|
152 |
||
153 |
# Get OS name from uname (Cygwin inexplicably adds _NT-x.x) |
|
154 |
UNAME_OS := $(shell $(UNAME) -s | $(CUT) -f1 -d_) |
|
155 |
||
156 |
ifeq ($(UNAME_OS), CYGWIN) |
|
157 |
OPENJDK_TARGET_OS := windows |
|
158 |
OPENJDK_TARGET_OS_TYPE := windows |
|
159 |
OPENJDK_TARGET_OS_ENV := windows.cygwin |
|
160 |
else |
|
161 |
OPENJDK_TARGET_OS_TYPE:=unix |
|
162 |
ifeq ($(UNAME_OS), Linux) |
|
163 |
OPENJDK_TARGET_OS := linux |
|
164 |
else ifeq ($(UNAME_OS), Darwin) |
|
165 |
OPENJDK_TARGET_OS := macosx |
|
166 |
else ifeq ($(UNAME_OS), SunOS) |
|
167 |
OPENJDK_TARGET_OS := solaris |
|
168 |
else |
|
169 |
OPENJDK_TARGET_OS := $(UNAME_OS) |
|
170 |
endif |
|
171 |
OPENJDK_TARGET_OS_ENV := $(OPENJDK_TARGET_OS) |
|
172 |
endif |
|
173 |
||
174 |
# Assume little endian unless otherwise specified |
|
175 |
OPENJDK_TARGET_CPU_ENDIAN := little |
|
176 |
||
177 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
|
178 |
# On solaris, use uname -p |
|
179 |
UNAME_CPU := $(shell $(UNAME) -p) |
|
180 |
# Assume 64-bit platform |
|
181 |
OPENJDK_TARGET_CPU_BITS := 64 |
|
182 |
ifeq ($(UNAME_CPU), i386) |
|
183 |
OPENJDK_TARGET_CPU := x86_64 |
|
184 |
else ifeq ($(UNAME_CPU), sparc) |
|
185 |
OPENJDK_TARGET_CPU := sparcv9 |
|
186 |
OPENJDK_TARGET_CPU_ENDIAN := big |
|
187 |
else |
|
188 |
OPENJDK_TARGET_CPU := $(UNAME_CPU) |
|
189 |
endif |
|
190 |
else |
|
191 |
# ... all others use uname -m |
|
192 |
UNAME_CPU := $(shell $(UNAME) -m) |
|
193 |
ifeq ($(UNAME_CPU), i686) |
|
194 |
OPENJDK_TARGET_CPU := x86 |
|
195 |
OPENJDK_TARGET_CPU_BITS := 32 |
|
196 |
else |
|
197 |
# Assume all others are 64-bit. We use the same CPU name as uname for |
|
198 |
# at least x86_64 and aarch64. |
|
199 |
OPENJDK_TARGET_CPU := $(UNAME_CPU) |
|
200 |
OPENJDK_TARGET_CPU_BITS := 64 |
|
201 |
endif |
|
202 |
endif |
|
203 |
||
204 |
OPENJDK_TARGET_CPU_ARCH := $(OPENJDK_TARGET_CPU) |
|
205 |
ifeq ($(OPENJDK_TARGET_CPU), x86_64) |
|
206 |
OPENJDK_TARGET_CPU_ARCH := x86 |
|
207 |
else ifeq ($(OPENJDK_TARGET_CPU), sparcv9) |
|
208 |
OPENJDK_TARGET_CPU_ARCH := sparc |
|
209 |
endif |
|
210 |
||
211 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
212 |
ifeq ($(wildcard $(TEST_IMAGE_DIR)/bin/fixpath.exe), ) |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
213 |
$(info Error: fixpath is missing from test image '$(TEST_IMAGE_DIR)') |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
214 |
$(error Cannot continue.) |
48078 | 215 |
endif |
216 |
FIXPATH := $(TEST_IMAGE_DIR)/bin/fixpath.exe -c |
|
217 |
PATH_SEP:=; |
|
218 |
else |
|
219 |
FIXPATH := |
|
220 |
PATH_SEP:=: |
|
221 |
endif |
|
222 |
||
52593
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
223 |
# Check number of cores and memory in MB |
48078 | 224 |
ifeq ($(OPENJDK_TARGET_OS), linux) |
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
225 |
NUM_CORES := $(shell $(CAT) /proc/cpuinfo | $(GREP) -c processor) |
52593
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
226 |
MEMORY_SIZE := $(shell \ |
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
227 |
$(EXPR) `$(CAT) /proc/meminfo | $(GREP) MemTotal | $(AWK) '{print $$2}'` / 1024 \ |
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
228 |
) |
48078 | 229 |
else ifeq ($(OPENJDK_TARGET_OS), macosx) |
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
230 |
NUM_CORES := $(shell /usr/sbin/sysctl -n hw.ncpu) |
52593
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
231 |
MEMORY_SIZE := $(shell $(EXPR) `/usr/sbin/sysctl -n hw.memsize` / 1024 / 1024) |
48078 | 232 |
else ifeq ($(OPENJDK_TARGET_OS), solaris) |
58549
9d9317fad3fe
8065704: Set LC_ALL=C for all relevant commands in the build system
ihse
parents:
55098
diff
changeset
|
233 |
NUM_CORES := $(shell /usr/sbin/psrinfo -v | $(GREP) -c on-line) |
52593
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
234 |
MEMORY_SIZE := $(shell \ |
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
235 |
/usr/sbin/prtconf 2> /dev/null | $(GREP) "^Memory [Ss]ize" | $(AWK) '{print $$3}' \ |
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
236 |
) |
48078 | 237 |
else ifeq ($(OPENJDK_TARGET_OS), windows) |
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
238 |
NUM_CORES := $(NUMBER_OF_PROCESSORS) |
52593
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
239 |
MEMORY_SIZE := $(shell \ |
53172
6bc1f8d41f4f
8216021: RunTest.gmk might set concurrency level to 1 on Windows
erikj
parents:
52593
diff
changeset
|
240 |
$(EXPR) `wmic computersystem get totalphysicalmemory -value \ |
6bc1f8d41f4f
8216021: RunTest.gmk might set concurrency level to 1 on Windows
erikj
parents:
52593
diff
changeset
|
241 |
| $(GREP) = | $(SED) 's/\\r//g' \ |
52593
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
242 |
| $(CUT) -d "=" -f 2-` / 1024 / 1024 \ |
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
243 |
) |
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
244 |
endif |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
245 |
ifeq ($(NUM_CORES), ) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
246 |
$(warn Could not find number of CPUs, assuming 1) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
49147
diff
changeset
|
247 |
NUM_CORES := 1 |
48078 | 248 |
endif |
52593
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
249 |
ifeq ($(MEMORY_SIZE), ) |
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
250 |
$(warn Could not find memory size, assuming 1024 MB) |
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
251 |
MEMORY_SIZE := 1024 |
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
252 |
endif |
48078 | 253 |
|
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
254 |
# Setup LD for AOT support |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
255 |
ifneq ($(DEVKIT_HOME), ) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
256 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
53460
65c813da7c65
8217613: [AOT] TEST_OPTS_AOT_MODULES doesn't work on mac
erikj
parents:
53172
diff
changeset
|
257 |
LD_JAOTC := $(DEVKIT_HOME)/VC/bin/x64/link.exe |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
258 |
LIBRARY_PREFIX := |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
259 |
SHARED_LIBRARY_SUFFIX := .dll |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
260 |
else ifeq ($(OPENJDK_TARGET_OS), linux) |
53460
65c813da7c65
8217613: [AOT] TEST_OPTS_AOT_MODULES doesn't work on mac
erikj
parents:
53172
diff
changeset
|
261 |
LD_JAOTC := $(DEVKIT_HOME)/bin/ld |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
262 |
LIBRARY_PREFIX := lib |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
263 |
SHARED_LIBRARY_SUFFIX := .so |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
264 |
else ifeq ($(OPENJDK_TARGET_OS), macosx) |
53460
65c813da7c65
8217613: [AOT] TEST_OPTS_AOT_MODULES doesn't work on mac
erikj
parents:
53172
diff
changeset
|
265 |
LD_JAOTC := $(DEVKIT_HOME)/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
266 |
LIBRARY_PREFIX := lib |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
267 |
SHARED_LIBRARY_SUFFIX := .dylib |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
268 |
else ifeq ($(OPENJDK_TARGET_OS), solaris) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
269 |
# Prefer system linker for AOT on Solaris. |
53460
65c813da7c65
8217613: [AOT] TEST_OPTS_AOT_MODULES doesn't work on mac
erikj
parents:
53172
diff
changeset
|
270 |
LD_JAOTC := ld |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
271 |
LIBRARY_PREFIX := lib |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
272 |
SHARED_LIBRARY_SUFFIX := .so |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
273 |
endif |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
274 |
else |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
275 |
LD := ld |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
276 |
endif |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
277 |
|
53526
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53460
diff
changeset
|
278 |
ifneq ($(wildcard $(JDK_IMAGE_DIR)/template.xml), ) |
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53460
diff
changeset
|
279 |
TEST_OPTS_JCOV := true |
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53460
diff
changeset
|
280 |
JCOV_IMAGE_DIR := $(JDK_IMAGE_DIR) |
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53460
diff
changeset
|
281 |
else |
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53460
diff
changeset
|
282 |
TEST_OPTS_JCOV := false |
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53460
diff
changeset
|
283 |
JCOV_IMAGE_DIR := |
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53460
diff
changeset
|
284 |
endif |
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53460
diff
changeset
|
285 |
|
48078 | 286 |
################################################################################ |
287 |
# Generate the ephemeral spec file |
|
288 |
################################################################################ |
|
289 |
||
290 |
# Now we can include additional custom support. |
|
291 |
# This might define CUSTOM_NEW_SPEC_LINE |
|
292 |
ifneq ($(CUSTOM_MAKE_DIR), ) |
|
293 |
include $(CUSTOM_MAKE_DIR)/RunTestsPrebuilt.gmk |
|
294 |
endif |
|
295 |
||
296 |
NEW_SPEC := $(OUTPUTDIR)/run-test-spec.gmk |
|
297 |
||
298 |
$(call CreateNewSpec, $(NEW_SPEC), \ |
|
299 |
# Generated file -- do not edit!, \ |
|
300 |
SPEC := $(NEW_SPEC), \ |
|
301 |
TOPDIR := $(TOPDIR), \ |
|
302 |
OUTPUTDIR := $(OUTPUTDIR), \ |
|
303 |
BOOT_JDK := $(BOOT_JDK), \ |
|
304 |
JT_HOME := $(JT_HOME), \ |
|
305 |
JDK_IMAGE_DIR := $(JDK_IMAGE_DIR), \ |
|
53526
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53460
diff
changeset
|
306 |
JCOV_IMAGE_DIR := $(JCOV_IMAGE_DIR), \ |
48078 | 307 |
TEST_IMAGE_DIR := $(TEST_IMAGE_DIR), \ |
49147
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48078
diff
changeset
|
308 |
SYMBOLS_IMAGE_DIR := $(SYMBOLS_IMAGE_DIR), \ |
48078 | 309 |
MAKE := $(MAKE), \ |
310 |
BASH := $(BASH), \ |
|
311 |
JIB_JAR := $(JIB_JAR), \ |
|
312 |
FIXPATH := $(FIXPATH), \ |
|
313 |
PATH_SEP := $(PATH_SEP), \ |
|
314 |
OPENJDK_TARGET_OS := $(OPENJDK_TARGET_OS), \ |
|
315 |
OPENJDK_TARGET_OS_TYPE := $(OPENJDK_TARGET_OS_TYPE), \ |
|
316 |
OPENJDK_TARGET_OS_ENV := $(OPENJDK_TARGET_OS_ENV), \ |
|
317 |
OPENJDK_TARGET_CPU := $(OPENJDK_TARGET_CPU), \ |
|
318 |
OPENJDK_TARGET_CPU_ARCH := $(OPENJDK_TARGET_CPU_ARCH), \ |
|
319 |
OPENJDK_TARGET_CPU_BITS := $(OPENJDK_TARGET_CPU_BITS), \ |
|
320 |
OPENJDK_TARGET_CPU_ENDIAN := $(OPENJDK_TARGET_CPU_ENDIAN), \ |
|
321 |
NUM_CORES := $(NUM_CORES), \ |
|
52593
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52393
diff
changeset
|
322 |
MEMORY_SIZE := $(MEMORY_SIZE), \ |
53460
65c813da7c65
8217613: [AOT] TEST_OPTS_AOT_MODULES doesn't work on mac
erikj
parents:
53172
diff
changeset
|
323 |
LD_JAOTC := $(LD_JAOTC), \ |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
324 |
LIBRARY_PREFIX := $(LIBRARY_PREFIX), \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52125
diff
changeset
|
325 |
SHARED_LIBRARY_SUFFIX := $(SHARED_LIBRARY_SUFFIX), \ |
48078 | 326 |
include $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk, \ |
53526
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53460
diff
changeset
|
327 |
TEST_OPTS_JCOV := $(TEST_OPTS_JCOV), \ |
48078 | 328 |
$(CUSTOM_NEW_SPEC_LINE), \ |
329 |
) |
|
330 |
||
331 |
################################################################################ |
|
332 |
# The run-test-prebuilt target |
|
333 |
################################################################################ |
|
334 |
||
335 |
SPEC := $(NEW_SPEC) |
|
336 |
||
337 |
default: all |
|
338 |
||
339 |
run-test-prebuilt: |
|
55098
609dc5c60c06
8224011: Failure handling in ExecuteWithLog fails in run-test-prebuilt
erikj
parents:
54382
diff
changeset
|
340 |
# Need to make sure the failure logs output dir exists since |
609dc5c60c06
8224011: Failure handling in ExecuteWithLog fails in run-test-prebuilt
erikj
parents:
54382
diff
changeset
|
341 |
# ExecuteWithLog is called in RunTests.gmk. The PrepareFailureLogs macro |
609dc5c60c06
8224011: Failure handling in ExecuteWithLog fails in run-test-prebuilt
erikj
parents:
54382
diff
changeset
|
342 |
# is unfortunately not available at this point. |
609dc5c60c06
8224011: Failure handling in ExecuteWithLog fails in run-test-prebuilt
erikj
parents:
54382
diff
changeset
|
343 |
$(call MakeDir, $(MAKESUPPORT_OUTPUTDIR)/failure-logs) |
48078 | 344 |
@$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error |
54382
61616f509ef8
8221762: Improve Main.gmk/FindTests.gmk bootstrap time
erikj
parents:
53526
diff
changeset
|
345 |
# The lazy initialization of the cache file in FindTests.gmk does not |
61616f509ef8
8221762: Improve Main.gmk/FindTests.gmk bootstrap time
erikj
parents:
53526
diff
changeset
|
346 |
# always work with RunTests.gmk. To guarantee that the jtreg test groups |
61616f509ef8
8221762: Improve Main.gmk/FindTests.gmk bootstrap time
erikj
parents:
53526
diff
changeset
|
347 |
# are always found and parsed, call FindTests.gmk stand alone once |
61616f509ef8
8221762: Improve Main.gmk/FindTests.gmk bootstrap time
erikj
parents:
53526
diff
changeset
|
348 |
# before calling RunTests.gmk. |
61616f509ef8
8221762: Improve Main.gmk/FindTests.gmk bootstrap time
erikj
parents:
53526
diff
changeset
|
349 |
@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/common/FindTests.gmk \ |
61616f509ef8
8221762: Improve Main.gmk/FindTests.gmk bootstrap time
erikj
parents:
53526
diff
changeset
|
350 |
SPEC=$(SPEC) FINDTESTS_STAND_ALONE=true |
48078 | 351 |
@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/RunTests.gmk run-test \ |
352 |
TEST="$(TEST)" |
|
353 |
||
354 |
all: run-test-prebuilt |
|
355 |
||
356 |
.PHONY: default all |