author | ihse |
Wed, 03 Oct 2018 16:07:40 +0200 | |
branch | JEP-230-microbenchmarks-branch |
changeset 56922 | 4219852032ba |
parent 56920 | e0750e33f818 |
child 56926 | d86dd5847e6d |
permissions | -rw-r--r-- |
44027 | 1 |
# |
56922 | 2 |
# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. |
44027 | 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 |
default: all |
|
27 |
||
28 |
include $(SPEC) |
|
29 |
include MakeBase.gmk |
|
30 |
include FindTests.gmk |
|
31 |
||
32 |
# We will always run multiple tests serially |
|
33 |
.NOTPARALLEL: |
|
34 |
||
47956
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
35 |
################################################################################ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
36 |
# Parse global control variables |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
37 |
################################################################################ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
38 |
|
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
39 |
ifneq ($(TEST_VM_OPTS), ) |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
40 |
ifneq ($(TEST_OPTS), ) |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
41 |
TEST_OPTS := $(TEST_OPTS);VM_OPTIONS=$(TEST_VM_OPTS) |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
42 |
else |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
43 |
TEST_OPTS := VM_OPTIONS=$(TEST_VM_OPTS) |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
44 |
endif |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
45 |
endif |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
46 |
|
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
47 |
$(eval $(call ParseKeywordVariable, TEST_OPTS, \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
48 |
KEYWORDS := JOBS TIMEOUT, \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
49 |
STRING_KEYWORDS := VM_OPTIONS, \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
50 |
)) |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
51 |
|
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
52 |
# Helper function to propagate TEST_OPTS values. |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
53 |
# |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
54 |
# Note: No spaces are allowed around the arguments. |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
55 |
# Arg $1 The variable in TEST_OPTS to propagate |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
56 |
# Arg $2 The control variable to propagate it to |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
57 |
define SetTestOpt |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
58 |
ifneq ($$(TEST_OPTS_$1), ) |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
59 |
$2_$1 := $$(TEST_OPTS_$1) |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
60 |
endif |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
61 |
endef |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
62 |
|
49147
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
63 |
# Setup _NT_SYMBOL_PATH on Windows |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
64 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
65 |
ifndef _NT_SYMBOL_PATH |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
66 |
# Can't use PathList here as it adds quotes around the value. |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
67 |
_NT_SYMBOL_PATH := \ |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
68 |
$(subst $(SPACE),;, $(foreach p, $(sort $(dir $(wildcard \ |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
69 |
$(addprefix $(SYMBOLS_IMAGE_DIR)/bin/, *.pdb */*.pdb)))), $(call FixPath, $p))) |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
70 |
export _NT_SYMBOL_PATH |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
71 |
$(info _NT_SYMBOL_PATH $(_NT_SYMBOL_PATH)) |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
72 |
endif |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
73 |
endif |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
74 |
|
47956
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
75 |
################################################################################ |
44027 | 76 |
# Hook to include the corresponding custom file, if present. |
47314 | 77 |
$(eval $(call IncludeCustomExtension, RunTests.gmk)) |
47956
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
78 |
################################################################################ |
44027 | 79 |
|
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47218
diff
changeset
|
80 |
TEST_RESULTS_DIR := $(OUTPUTDIR)/test-results |
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47218
diff
changeset
|
81 |
TEST_SUPPORT_DIR := $(OUTPUTDIR)/test-support |
47943 | 82 |
TEST_SUMMARY := $(TEST_RESULTS_DIR)/test-summary.txt |
48042 | 83 |
TEST_LAST_IDS := $(TEST_SUPPORT_DIR)/test-last-ids.txt |
44027 | 84 |
|
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
85 |
ifeq ($(CUSTOM_ROOT), ) |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
86 |
JTREG_TOPDIR := $(TOPDIR) |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
87 |
else |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
88 |
JTREG_TOPDIR := $(CUSTOM_ROOT) |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
89 |
endif |
44027 | 90 |
|
47986 | 91 |
JTREG_FAILURE_HANDLER_DIR := $(TEST_IMAGE_DIR)/failure_handler |
92 |
JTREG_FAILURE_HANDLER := $(JTREG_FAILURE_HANDLER_DIR)/jtregFailureHandler.jar |
|
93 |
||
94 |
ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), ) |
|
95 |
JTREG_FAILURE_HANDLER_OPTIONS := \ |
|
96 |
-timeoutHandlerDir:$(JTREG_FAILURE_HANDLER) \ |
|
97 |
-observerDir:$(JTREG_FAILURE_HANDLER) \ |
|
98 |
-timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
|
99 |
-observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ |
|
100 |
-timeoutHandlerTimeout:0 |
|
101 |
endif |
|
102 |
||
48058
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
103 |
GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, $(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher)) |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
104 |
GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, $(GTEST_LAUNCHER_DIRS))) |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
105 |
|
44027 | 106 |
################################################################################ |
107 |
# Parse control variables |
|
108 |
################################################################################ |
|
109 |
||
56920
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
110 |
### Jtreg |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
111 |
|
47956
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
112 |
ifneq ($(TEST_OPTS), ) |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
113 |
# Inform the user |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
114 |
$(info Running tests using TEST_OPTS control variable '$(TEST_OPTS)') |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
115 |
|
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
116 |
$(eval $(call SetTestOpt,VM_OPTIONS,JTREG)) |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
117 |
$(eval $(call SetTestOpt,VM_OPTIONS,GTEST)) |
56920
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
118 |
$(eval $(call SetTestOpt,VM_OPTIONS,MICRO)) |
47956
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
119 |
|
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
120 |
$(eval $(call SetTestOpt,JOBS,JTREG)) |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
121 |
$(eval $(call SetTestOpt,TIMEOUT,JTREG)) |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
122 |
endif |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
123 |
|
44027 | 124 |
$(eval $(call ParseKeywordVariable, JTREG, \ |
125 |
KEYWORDS := JOBS TIMEOUT TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM, \ |
|
126 |
STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS, \ |
|
127 |
)) |
|
128 |
||
129 |
ifneq ($(JTREG), ) |
|
130 |
# Inform the user |
|
131 |
$(info Running tests using JTREG control variable '$(JTREG)') |
|
132 |
endif |
|
133 |
||
56920
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
134 |
### Gtest |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
135 |
|
44027 | 136 |
$(eval $(call ParseKeywordVariable, GTEST, \ |
137 |
KEYWORDS := REPEAT, \ |
|
47956
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
138 |
STRING_KEYWORDS := OPTIONS VM_OPTIONS, \ |
44027 | 139 |
)) |
140 |
||
141 |
ifneq ($(GTEST), ) |
|
142 |
# Inform the user |
|
143 |
$(info Running tests using GTEST control variable '$(GTEST)') |
|
144 |
endif |
|
145 |
||
56920
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
146 |
### Microbenchmarks |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
147 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
148 |
$(eval $(call ParseKeywordVariable, MICRO, \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
149 |
KEYWORDS := ITER FORK TIME WARMUP_ITER WARMUP_TIME, \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
150 |
STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS TEST_JDK BENCHMARKS_JAR, \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
151 |
)) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
152 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
153 |
ifneq ($(MICRO), ) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
154 |
# Inform the user |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
155 |
$(info Running tests using MICRO control variable '$(MICRO)') |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
156 |
endif |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
157 |
|
44027 | 158 |
|
159 |
################################################################################ |
|
160 |
# Component-specific Jtreg settings |
|
161 |
################################################################################ |
|
162 |
||
163 |
ifeq ($(TEST_JOBS), 0) |
|
164 |
# If TEST_JOBS is not specified, hotspot fallback default is |
|
165 |
# min(num_cores / 2, 12). |
|
166 |
hotspot_JTREG_JOBS := $(shell $(EXPR) $(NUM_CORES) / 2) |
|
167 |
ifeq ($(hotspot_JTREG_JOBS), 0) |
|
168 |
hotspot_JTREG_JOBS := 1 |
|
169 |
else ifeq ($(shell $(EXPR) $(hotspot_JTREG_JOBS) \> 12), 1) |
|
170 |
hotspot_JTREG_JOBS := 12 |
|
171 |
endif |
|
172 |
endif |
|
173 |
||
174 |
hotspot_JTREG_MAX_MEM := 0 |
|
175 |
hotspot_JTREG_ASSERT := false |
|
176 |
hotspot_JTREG_NATIVEPATH := $(TEST_IMAGE_DIR)/hotspot/jtreg/native |
|
177 |
jdk_JTREG_NATIVEPATH := $(TEST_IMAGE_DIR)/jdk/jtreg/native |
|
178 |
||
47941
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
179 |
jdk_JTREG_PROBLEM_LIST += $(TOPDIR)/test/jdk/ProblemList.txt |
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
180 |
jaxp_JTREG_PROBLEM_LIST += $(TOPDIR)/test/jaxp/ProblemList.txt |
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
181 |
langtools_JTREG_PROBLEM_LIST += $(TOPDIR)/test/langtools/ProblemList.txt |
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
182 |
nashorn_JTREG_PROBLEM_LIST += $(TOPDIR)/test/nashorn/ProblemList.txt |
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
183 |
hotspot_JTREG_PROBLEM_LIST += $(TOPDIR)/test/hotspot/jtreg/ProblemList.txt |
44027 | 184 |
|
185 |
################################################################################ |
|
186 |
# Parse test selection |
|
187 |
# |
|
188 |
# The user has given a test selection in the TEST variable. We must parse it |
|
189 |
# and determine what that means in terms of actual calls to the test framework. |
|
190 |
# |
|
191 |
# The parse functions take as argument a test specification as given by the |
|
192 |
# user, and returns a fully qualified test descriptor if it was a match, or |
|
193 |
# nothing if not. A single test specification can result in multiple test |
|
194 |
# descriptors being returned. A valid test descriptor must always be accepted |
|
195 |
# and returned identically. |
|
196 |
################################################################################ |
|
197 |
||
198 |
# Helper function to determine if a test specification is a Gtest test |
|
199 |
# |
|
200 |
# It is a Gtest test if it is either "gtest", or "gtest:" followed by an optional |
|
48058
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
201 |
# test filter string, and an optional "/<variant>" to select a specific JVM |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
202 |
# variant. If no variant is specified, all found variants are tested. |
44027 | 203 |
define ParseGtestTestSelection |
204 |
$(if $(filter gtest%, $1), \ |
|
205 |
$(if $(filter gtest, $1), \ |
|
48058
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
206 |
$(addprefix gtest:all/, $(GTEST_VARIANTS)) \ |
44027 | 207 |
, \ |
48058
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
208 |
$(if $(strip $(or $(filter gtest/%, $1) $(filter gtest:/%, $1))), \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
209 |
$(patsubst gtest:/%, gtest:all/%, $(patsubst gtest/%, gtest:/%, $1)) \ |
44027 | 210 |
, \ |
48058
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
211 |
$(if $(filter gtest:%, $1), \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
212 |
$(if $(findstring /, $1), \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
213 |
$1 \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
214 |
, \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
215 |
$(addprefix $1/, $(GTEST_VARIANTS)) \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
216 |
) \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
217 |
) \ |
44027 | 218 |
) \ |
219 |
) \ |
|
220 |
) |
|
221 |
endef |
|
222 |
||
56920
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
223 |
# Helper function to determine if a test specification is a microbenchmark test |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
224 |
# |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
225 |
# It is a microbenchmark test if it is either "micro", or "micro:" followed by an optional |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
226 |
# test filter string. |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
227 |
define ParseMicroTestSelection |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
228 |
$(if $(filter micro%, $1), \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
229 |
$(if $(filter micro, $1), \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
230 |
micro:all \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
231 |
, \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
232 |
$(if $(filter micro:, $1), \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
233 |
micro:all \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
234 |
, \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
235 |
$1 \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
236 |
) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
237 |
) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
238 |
) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
239 |
endef |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
240 |
|
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
241 |
# Helper function that removes the TOPDIR part |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
242 |
CleanupJtregPath = \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
243 |
$(strip $(patsubst %/, %, $(subst $(JTREG_TOPDIR)/,, $1))) |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
244 |
|
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
245 |
# Take a partial Jtreg root path and return a full, absolute path to that Jtreg |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
246 |
# root. Also support having "hotspot" as an alias for "hotspot/jtreg". |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
247 |
ExpandJtregRoot = \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
248 |
$(call CleanupJtregPath, $(wildcard \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
249 |
$(if $(filter /%, $1), \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
250 |
$(if $(wildcard $(strip $1)/TEST.ROOT), \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
251 |
$1 \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
252 |
) \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
253 |
, \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
254 |
$(filter $(addprefix %, $1), $(JTREG_TESTROOTS) $(addsuffix /, $(JTREG_TESTROOTS))) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
255 |
$(filter $(addprefix %, $(strip $1)/jtreg), $(JTREG_TESTROOTS) $(addsuffix /, $(JTREG_TESTROOTS))) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
256 |
) \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
257 |
)) |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
258 |
|
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
259 |
# Take a partial Jtreg test path and return a full, absolute path to that Jtreg |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
260 |
# test. Also support having "hotspot" as an alias for "hotspot/jtreg". |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
261 |
ExpandJtregPath = \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
262 |
$(if $(call ExpandJtregRoot, $1), \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
263 |
$(call ExpandJtregRoot, $1) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
264 |
, \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
265 |
$(call CleanupJtregPath, $(wildcard \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
266 |
$(if $(filter /%, $1), \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
267 |
$1 \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
268 |
, \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
269 |
$(addsuffix /$(strip $1), $(JTREG_TESTROOTS) $(TEST_BASEDIRS)) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
270 |
$(addsuffix $(strip $(patsubst hotspot/%, /hotspot/jtreg/%, $1)), $(JTREG_TESTROOTS) $(TEST_BASEDIRS)) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
271 |
) \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
272 |
)) \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
273 |
) |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
274 |
|
44027 | 275 |
# Helper function to determine if a test specification is a Jtreg test |
276 |
# |
|
277 |
# It is a Jtreg test if it optionally begins with jtreg:, and then is either |
|
278 |
# an unspecified group name (possibly prefixed by :), or a group in a |
|
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
279 |
# specified test root, or a path to a test or test directory, |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
280 |
# either absolute or relative to any of the TEST_BASEDIRS or test roots. |
44027 | 281 |
define ParseJtregTestSelection |
282 |
$(eval TEST_NAME := $(strip $(patsubst jtreg:%, %, $1))) \ |
|
283 |
$(if $(or $(findstring :, $(TEST_NAME)), $(findstring /, $(TEST_NAME))), , \ |
|
284 |
$(eval TEST_NAME := :$(TEST_NAME)) \ |
|
285 |
) \ |
|
286 |
$(if $(findstring :, $(TEST_NAME)), \ |
|
287 |
$(if $(filter :%, $(TEST_NAME)), \ |
|
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
288 |
$(eval TEST_GROUP := $(patsubst :%, %, $(TEST_NAME))) \ |
48042 | 289 |
$(eval TEST_ROOTS := $(foreach test_root, $(JTREG_TESTROOTS), \ |
290 |
$(call CleanupJtregPath, $(test_root)))) \ |
|
44027 | 291 |
, \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
292 |
$(eval TEST_PATH := $(word 1, $(subst :, $(SPACE), $(TEST_NAME)))) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
293 |
$(eval TEST_GROUP := $(word 2, $(subst :, $(SPACE), $(TEST_NAME)))) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
294 |
$(eval TEST_ROOTS := $(call ExpandJtregRoot, $(TEST_PATH))) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
295 |
) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
296 |
$(foreach test_root, $(TEST_ROOTS), \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
297 |
$(if $(filter /%, $(test_root)), \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
298 |
jtreg:$(test_root):$(TEST_GROUP) \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
299 |
, \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
300 |
$(if $(filter $(TEST_GROUP), $($(JTREG_TOPDIR)/$(test_root)_JTREG_TEST_GROUPS)), \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
301 |
jtreg:$(test_root):$(TEST_GROUP) \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
302 |
) \ |
44027 | 303 |
) \ |
304 |
) \ |
|
305 |
, \ |
|
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
306 |
$(eval TEST_PATHS := $(call ExpandJtregPath, $(TEST_NAME))) \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
307 |
$(foreach test_path, $(TEST_PATHS), \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
308 |
jtreg:$(test_path) \ |
44027 | 309 |
) \ |
310 |
) |
|
311 |
endef |
|
312 |
||
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
313 |
# Helper function to determine if a test specification is a special test |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
314 |
# |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
315 |
# It is a special test if it is "special:" followed by a test name. |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
316 |
define ParseSpecialTestSelection |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
317 |
$(if $(filter special:%, $1), \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
318 |
$1 \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
319 |
) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
320 |
endef |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
321 |
|
44027 | 322 |
ifeq ($(TEST), ) |
323 |
$(info No test selection given in TEST!) |
|
324 |
$(info Please use e.g. 'run-test TEST=tier1' or 'run-test-tier1') |
|
47928
fb62d4519338
8191715: Update documentation pointing to "common" directory
ihse
parents:
47329
diff
changeset
|
325 |
$(info See doc/testing.[md|html] for help) |
44027 | 326 |
$(error Cannot continue) |
327 |
endif |
|
328 |
||
329 |
# Now intelligently convert the test selection given by the user in TEST |
|
330 |
# into a list of fully qualified test descriptors of the tests to run. |
|
331 |
TESTS_TO_RUN := |
|
332 |
$(foreach test, $(TEST), \ |
|
333 |
$(eval PARSED_TESTS := $(call ParseCustomTestSelection, $(test))) \ |
|
334 |
$(if $(strip $(PARSED_TESTS)), , \ |
|
335 |
$(eval PARSED_TESTS += $(call ParseGtestTestSelection, $(test))) \ |
|
336 |
) \ |
|
337 |
$(if $(strip $(PARSED_TESTS)), , \ |
|
56920
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
338 |
$(eval PARSED_TESTS += $(call ParseMicroTestSelection, $(test))) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
339 |
) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
340 |
$(if $(strip $(PARSED_TESTS)), , \ |
44027 | 341 |
$(eval PARSED_TESTS += $(call ParseJtregTestSelection, $(test))) \ |
342 |
) \ |
|
343 |
$(if $(strip $(PARSED_TESTS)), , \ |
|
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
344 |
$(eval PARSED_TESTS += $(call ParseSpecialTestSelection, $(test))) \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
345 |
) \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
346 |
$(if $(strip $(PARSED_TESTS)), , \ |
44027 | 347 |
$(eval UNKNOWN_TEST := $(test)) \ |
348 |
) \ |
|
349 |
$(eval TESTS_TO_RUN += $(PARSED_TESTS)) \ |
|
350 |
) |
|
351 |
||
352 |
ifneq ($(UNKNOWN_TEST), ) |
|
353 |
$(info Unknown test selection: '$(UNKNOWN_TEST)') |
|
47928
fb62d4519338
8191715: Update documentation pointing to "common" directory
ihse
parents:
47329
diff
changeset
|
354 |
$(info See doc/testing.[md|html] for help) |
44027 | 355 |
$(error Cannot continue) |
356 |
endif |
|
357 |
||
358 |
TESTS_TO_RUN := $(strip $(TESTS_TO_RUN)) |
|
359 |
||
360 |
||
361 |
# Present the result of our parsing to the user |
|
362 |
$(info Test selection '$(TEST)', will run:) |
|
363 |
$(foreach test, $(TESTS_TO_RUN), $(info * $(test))) |
|
364 |
||
365 |
||
366 |
################################################################################ |
|
367 |
# Functions for setting up rules for running the selected tests |
|
368 |
# |
|
369 |
# The SetupRun*Test functions all have the same interface: |
|
370 |
# |
|
371 |
# Parameter 1 is the name of the rule. This is the test id, based on the test |
|
372 |
# descriptor, and this is also used as variable prefix, and the targets |
|
373 |
# generated are listed in a variable by that name. |
|
374 |
# |
|
375 |
# Remaining parameters are named arguments. Currently this is only: |
|
376 |
# TEST -- The properly formatted fully qualified test descriptor |
|
377 |
# |
|
378 |
# After the rule named by the test id has been executed, the following |
|
379 |
# variables will be available: |
|
380 |
# testid_TOTAL - the total number of tests run |
|
381 |
# testid_PASSED - the number of successful tests |
|
382 |
# testid_FAILED - the number of failed tests |
|
383 |
# testid_ERROR - the number of tests was neither successful or failed |
|
384 |
# |
|
385 |
################################################################################ |
|
386 |
||
387 |
### Rules for Gtest |
|
388 |
||
389 |
SetupRunGtestTest = $(NamedParamsMacroTemplate) |
|
390 |
define SetupRunGtestTestBody |
|
391 |
$1_TEST_RESULTS_DIR := $$(TEST_RESULTS_DIR)/$1 |
|
392 |
$1_TEST_SUPPORT_DIR := $$(TEST_SUPPORT_DIR)/$1 |
|
48042 | 393 |
$1_EXITCODE := $$($1_TEST_RESULTS_DIR)/exitcode.txt |
44027 | 394 |
|
48058
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
395 |
$1_VARIANT := $$(lastword $$(subst /, , $$($1_TEST))) |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
396 |
ifeq ($$(filter $$($1_VARIANT), $$(GTEST_VARIANTS)), ) |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
397 |
$$(error Invalid gtest variant '$$($1_VARIANT)'. Valid variants: $$(GTEST_VARIANTS)) |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
398 |
endif |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
399 |
$1_TEST_NAME := $$(strip $$(patsubst %/$$($1_VARIANT), %, \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
400 |
$$(patsubst gtest:%, %, $$($1_TEST)))) |
44027 | 401 |
ifneq ($$($1_TEST_NAME), all) |
402 |
$1_GTEST_FILTER := --gtest_filter=$$($1_TEST_NAME)* |
|
403 |
endif |
|
404 |
||
405 |
ifneq ($$(GTEST_REPEAT), ) |
|
406 |
$1_GTEST_REPEAT :=--gtest_repeat=$$(GTEST_REPEAT) |
|
407 |
endif |
|
408 |
||
409 |
run-test-$1: |
|
410 |
$$(call LogWarn) |
|
411 |
$$(call LogWarn, Running test '$$($1_TEST)') |
|
412 |
$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
|
413 |
$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, \ |
|
48058
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
414 |
$$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \ |
48042 | 415 |
-jdk $(JDK_IMAGE_DIR) $$($1_GTEST_FILTER) \ |
416 |
--gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \ |
|
417 |
$$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \ |
|
418 |
> >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \ |
|
419 |
&& $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
|
420 |
|| $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
|
421 |
) |
|
44027 | 422 |
|
423 |
$1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt |
|
424 |
||
425 |
parse-test-$1: run-test-$1 |
|
426 |
$$(call LogWarn, Finished running test '$$($1_TEST)') |
|
427 |
$$(call LogWarn, Test report is stored in $$(strip \ |
|
428 |
$$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR)))) |
|
48042 | 429 |
$$(if $$(wildcard $$($1_RESULT_FILE)), \ |
47956
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
430 |
$$(eval $1_TOTAL := $$(shell $$(AWK) '/==========.* tests? from .* \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
431 |
test cases? ran/ { print $$$$2 }' $$($1_RESULT_FILE))) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
432 |
$$(if $$($1_TOTAL), , $$(eval $1_TOTAL := 0)) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
433 |
$$(eval $1_PASSED := $$(shell $$(AWK) '/\[ PASSED \] .* tests?./ \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
434 |
{ print $$$$4 }' $$($1_RESULT_FILE))) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
435 |
$$(if $$($1_PASSED), , $$(eval $1_PASSED := 0)) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
436 |
$$(eval $1_FAILED := $$(shell $$(AWK) '/\[ FAILED \] .* tests?, \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
437 |
listed below/ { print $$$$4 }' $$($1_RESULT_FILE))) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
438 |
$$(if $$($1_FAILED), , $$(eval $1_FAILED := 0)) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
439 |
$$(eval $1_ERROR := $$(shell \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
440 |
$$(EXPR) $$($1_TOTAL) - $$($1_PASSED) - $$($1_FAILED))) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
441 |
, \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
442 |
$$(eval $1_PASSED := 0) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
443 |
$$(eval $1_FAILED := 0) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
444 |
$$(eval $1_ERROR := 1) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
445 |
$$(eval $1_TOTAL := 1) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
446 |
) |
44027 | 447 |
|
448 |
$1: run-test-$1 parse-test-$1 |
|
449 |
||
450 |
TARGETS += $1 |
|
451 |
endef |
|
452 |
||
453 |
################################################################################ |
|
454 |
||
56920
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
455 |
### Rules for Microbenchmarks |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
456 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
457 |
# Helper function for SetupRunMicroTest. Set a MICRO_* variable from, in order: |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
458 |
# 1) Specified by user on command line |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
459 |
# 2) Generic default |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
460 |
# |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
461 |
# Note: No spaces are allowed around the arguments. |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
462 |
# Arg $1 The test ID (i.e. $1 in SetupRunMicroTest) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
463 |
# Arg $2 Base variable, e.g. MICRO_TEST_JDK |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
464 |
# Arg $3 The default value (optional) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
465 |
define SetMicroValue |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
466 |
ifneq ($$($2), ) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
467 |
$1_$2 := $$($2) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
468 |
else |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
469 |
ifneq ($3, ) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
470 |
$1_$2 := $3 |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
471 |
endif |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
472 |
endif |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
473 |
endef |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
474 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
475 |
SetupRunMicroTest = $(NamedParamsMacroTemplate) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
476 |
define SetupRunMicroTestBody |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
477 |
$1_TEST_RESULTS_DIR := $$(TEST_RESULTS_DIR)/$1 |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
478 |
$1_TEST_SUPPORT_DIR := $$(TEST_SUPPORT_DIR)/$1 |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
479 |
$1_EXITCODE := $$($1_TEST_RESULTS_DIR)/exitcode.txt |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
480 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
481 |
$1_TEST_NAME := $$(strip $$(patsubst micro:%, %, $$($1_TEST))) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
482 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
483 |
$$(eval $$(call SetMicroValue,$1,MICRO_BENCHMARKS_JAR,$$(TEST_IMAGE_DIR)/micro/microbenchmarks.jar)) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
484 |
$$(eval $$(call SetMicroValue,$1,MICRO_TEST_JDK,$$(JDK_IMAGE_DIR))) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
485 |
$$(eval $$(call SetMicroValue,$1,MICRO_JAVA_OPTIONS)) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
486 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
487 |
# Current tests needs to open java.io |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
488 |
$1_MICRO_JAVA_OPTIONS += --add-opens=java.base/java.io=ALL-UNNAMED |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
489 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
490 |
# Save output as CSV file |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
491 |
$1_MICRO_BASIC_OPTIONS += -rf csv -rff $$($1_TEST_RESULTS_DIR)/jmh-result.csv |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
492 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
493 |
# Always specify test JVM |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
494 |
$1_MICRO_BASIC_OPTIONS += -jvm $$($1_MICRO_TEST_JDK)/bin/java |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
495 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
496 |
ifneq ($$(MICRO_VM_OPTIONS), ) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
497 |
$1_MICRO_VM_OPTIONS := -jvmArgs $$(MICRO_VM_OPTIONS) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
498 |
endif |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
499 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
500 |
ifneq ($$(MICRO_ITER), ) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
501 |
$1_MICRO_ITER := -i $$(MICRO_ITER) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
502 |
endif |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
503 |
ifneq ($$(MICRO_FORK), ) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
504 |
$1_MICRO_FORK := -f $$(MICRO_FORK) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
505 |
endif |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
506 |
ifneq ($$(MICRO_TIME), ) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
507 |
$1_MICRO_TIME := -r $$(MICRO_TIME) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
508 |
endif |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
509 |
ifneq ($$(MICRO_WARMUP_ITER), ) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
510 |
$1_MICRO_WARMUP_ITER := -wi $$(MICRO_WARMUP_ITER) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
511 |
endif |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
512 |
ifneq ($$(MICRO_WARMUP_TIME), ) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
513 |
$1_MICRO_WARMUP_TIME := -w $$(MICRO_WARMUP_TIME) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
514 |
endif |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
515 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
516 |
run-test-$1: |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
517 |
$$(call LogWarn) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
518 |
$$(call LogWarn, Running test '$$($1_TEST)') |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
519 |
$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
520 |
$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/micro, \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
521 |
$$(JAVA) $$($1_MICRO_JAVA_OPTIONS) -jar $$($1_MICRO_BENCHMARKS_JAR) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
522 |
$$($1_MICRO_ITER) $$($1_MICRO_FORK) $$($1_MICRO_TIME) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
523 |
$$($1_MICRO_WARMUP_ITER) $$($1_MICRO_WARMUP_TIME) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
524 |
$$($1_MICRO_VM_OPTIONS) $$($1_MICRO_BASIC_OPTIONS) $$(MICRO_OPTIONS) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
525 |
$$($1_TEST_NAME) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
526 |
> >($(TEE) $$($1_TEST_RESULTS_DIR)/micro.txt) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
527 |
&& $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
528 |
|| $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
529 |
) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
530 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
531 |
$1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/micro.txt |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
532 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
533 |
parse-test-$1: run-test-$1 |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
534 |
$$(call LogWarn, Finished running test '$$($1_TEST)') |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
535 |
$$(call LogWarn, Test report is stored in $$(strip \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
536 |
$$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR)))) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
537 |
$$(if $$(wildcard $$($1_EXITCODE)), \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
538 |
$$(eval $1_EXIT_CODE := $$(shell $$(CAT) $$($1_EXITCODE))) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
539 |
$$(if $$(filter 0, $$($1_EXIT_CODE)), \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
540 |
$$(eval $1_PASSED := 1) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
541 |
$$(eval $1_ERROR := 0) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
542 |
, \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
543 |
$$(eval $1_PASSED := 0) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
544 |
$$(eval $1_ERROR := 1) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
545 |
) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
546 |
$$(eval $1_FAILED := 0) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
547 |
$$(eval $1_TOTAL := $$(shell \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
548 |
$$(EXPR) $$($1_PASSED) + $$($1_ERROR))) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
549 |
, \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
550 |
$$(eval $1_PASSED := 0) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
551 |
$$(eval $1_FAILED := 0) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
552 |
$$(eval $1_ERROR := 1) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
553 |
$$(eval $1_TOTAL := 1) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
554 |
) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
555 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
556 |
$1: run-test-$1 parse-test-$1 |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
557 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
558 |
TARGETS += $1 |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
559 |
endef |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
560 |
|
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
561 |
################################################################################ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
562 |
|
44027 | 563 |
### Rules for Jtreg |
564 |
||
565 |
# Helper function for SetupRunJtregTest. Set a JTREG_* variable from, in order: |
|
566 |
# 1) Specified by user on command line |
|
567 |
# 2) Component-specific default |
|
568 |
# 3) Generic default |
|
569 |
# |
|
570 |
# Note: No spaces are allowed around the arguments. |
|
571 |
# Arg $1 The test ID (i.e. $1 in SetupRunJtregTest) |
|
572 |
# Arg $2 Base variable, e.g. JTREG_JOBS |
|
573 |
# Arg $3 The default value (optional) |
|
574 |
define SetJtregValue |
|
575 |
ifneq ($$($2), ) |
|
576 |
$1_$2 := $$($2) |
|
577 |
else |
|
578 |
ifneq ($$($$($1_COMPONENT)_$2), ) |
|
579 |
$1_$2 := $$($$($1_COMPONENT)_$2) |
|
580 |
else |
|
581 |
ifneq ($3, ) |
|
582 |
$1_$2 := $3 |
|
583 |
endif |
|
584 |
endif |
|
585 |
endif |
|
586 |
endef |
|
587 |
||
588 |
SetupRunJtregTest = $(NamedParamsMacroTemplate) |
|
589 |
define SetupRunJtregTestBody |
|
590 |
$1_TEST_RESULTS_DIR := $$(TEST_RESULTS_DIR)/$1 |
|
591 |
$1_TEST_SUPPORT_DIR := $$(TEST_SUPPORT_DIR)/$1 |
|
48042 | 592 |
$1_EXITCODE := $$($1_TEST_RESULTS_DIR)/exitcode.txt |
44027 | 593 |
|
594 |
$1_TEST_NAME := $$(strip $$(patsubst jtreg:%, %, $$($1_TEST))) |
|
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
595 |
|
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
596 |
$1_COMPONENT := \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
597 |
$$(strip $$(foreach root, $$(JTREG_TESTROOTS), \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
598 |
$$(if $$(filter $$(root)%, $$(JTREG_TOPDIR)/$$($1_TEST_NAME)), \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
599 |
$$(lastword $$(subst /, $$(SPACE), $$(root))) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
600 |
) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
601 |
)) |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
602 |
# This will work only as long as just hotspot has the additional "jtreg" directory |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
603 |
ifeq ($$($1_COMPONENT), jtreg) |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
604 |
$1_COMPONENT := hotspot |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
605 |
endif |
44027 | 606 |
|
45104 | 607 |
ifeq ($$(JT_HOME), ) |
608 |
$$(info Error: jtreg framework is not found.) |
|
609 |
$$(info Please run configure using --with-jtreg.) |
|
610 |
$$(error Cannot continue) |
|
611 |
endif |
|
612 |
||
44027 | 613 |
# Unfortunately, we need different defaults for some JTREG values, |
614 |
# depending on what component we're running. |
|
615 |
||
616 |
# Convert JTREG_foo into $1_JTREG_foo with a suitable value. |
|
617 |
$$(eval $$(call SetJtregValue,$1,JTREG_TEST_MODE,agentvm)) |
|
618 |
$$(eval $$(call SetJtregValue,$1,JTREG_ASSERT,true)) |
|
619 |
$$(eval $$(call SetJtregValue,$1,JTREG_MAX_MEM,512m)) |
|
620 |
$$(eval $$(call SetJtregValue,$1,JTREG_NATIVEPATH)) |
|
621 |
$$(eval $$(call SetJtregValue,$1,JTREG_BASIC_OPTIONS)) |
|
47941
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
622 |
$$(eval $$(call SetJtregValue,$1,JTREG_PROBLEM_LIST)) |
44027 | 623 |
|
624 |
ifneq ($(TEST_JOBS), 0) |
|
625 |
# User has specified TEST_JOBS, use that as fallback default |
|
626 |
$$(eval $$(call SetJtregValue,$1,JTREG_JOBS,$$(TEST_JOBS))) |
|
627 |
else |
|
628 |
# Use JOBS as default (except for hotspot) |
|
629 |
$$(eval $$(call SetJtregValue,$1,JTREG_JOBS,$$(JOBS))) |
|
630 |
endif |
|
631 |
||
47058
85aaac5701da
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46230
diff
changeset
|
632 |
# Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since |
44027 | 633 |
# we may end up with a lot of JVM's |
47058
85aaac5701da
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46230
diff
changeset
|
634 |
$1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS)) |
44027 | 635 |
|
636 |
JTREG_TIMEOUT ?= 4 |
|
637 |
JTREG_VERBOSE ?= fail,error,summary |
|
638 |
JTREG_RETAIN ?= fail,error |
|
639 |
||
640 |
ifneq ($$($1_JTREG_MAX_MEM), 0) |
|
641 |
$1_JTREG_BASIC_OPTIONS += -vmoption:-Xmx$$($1_JTREG_MAX_MEM) |
|
642 |
$1_JTREG_LAUNCHER_OPTIONS += -Xmx$$($1_JTREG_MAX_MEM) |
|
643 |
endif |
|
644 |
||
645 |
$1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \ |
|
646 |
-verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \ |
|
647 |
-concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT) \ |
|
47058
85aaac5701da
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46230
diff
changeset
|
648 |
-vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) |
44027 | 649 |
|
650 |
$1_JTREG_BASIC_OPTIONS += -automatic -keywords:\!ignore -ignore:quiet |
|
651 |
||
47329 | 652 |
# Make it possible to specify the JIB_DATA_DIR for tests using the |
653 |
# JIB Artifact resolver |
|
654 |
$1_JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR |
|
44027 | 655 |
# Some tests needs to find a boot JDK using the JDK8_HOME variable. |
656 |
$1_JTREG_BASIC_OPTIONS += -e:JDK8_HOME=$$(BOOT_JDK) |
|
49147
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
657 |
# If running on Windows, propagate the _NT_SYMBOL_PATH to enable |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
658 |
# symbol lookup in hserr files |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
659 |
ifeq ($$(OPENJDK_TARGET_OS), windows) |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
660 |
$1_JTREG_BASIC_OPTIONS += -e:_NT_SYMBOL_PATH |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
661 |
endif |
44027 | 662 |
|
663 |
$1_JTREG_BASIC_OPTIONS += \ |
|
664 |
$$(addprefix -javaoption:, $$(JTREG_JAVA_OPTIONS)) \ |
|
665 |
$$(addprefix -vmoption:, $$(JTREG_VM_OPTIONS)) \ |
|
666 |
# |
|
667 |
||
668 |
ifeq ($$($1_JTREG_ASSERT), true) |
|
669 |
$1_JTREG_BASIC_OPTIONS += -ea -esa |
|
670 |
endif |
|
671 |
||
672 |
ifneq ($$($1_JTREG_NATIVEPATH), ) |
|
673 |
$1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH) |
|
674 |
endif |
|
675 |
||
47941
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
676 |
ifneq ($$($1_JTREG_PROBLEM_LIST), ) |
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
677 |
$1_JTREG_BASIC_OPTIONS += $$(addprefix -exclude:, $$($1_JTREG_PROBLEM_LIST)) |
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
678 |
endif |
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
679 |
|
51856
11b9d3a6f31c
8211037: Load jib jars dynamically from JibArtifactManager
erikj
parents:
50908
diff
changeset
|
680 |
ifneq ($$(JIB_HOME), ) |
11b9d3a6f31c
8211037: Load jib jars dynamically from JibArtifactManager
erikj
parents:
50908
diff
changeset
|
681 |
$1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME) |
46230
e0ca0417b74d
8180600: make run-test does not work with jib test dependencies
erikj
parents:
45104
diff
changeset
|
682 |
endif |
e0ca0417b74d
8180600: make run-test does not work with jib test dependencies
erikj
parents:
45104
diff
changeset
|
683 |
|
50908 | 684 |
$1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_GRAAL_DIR=${TEST_IMAGE_DIR}/hotspot/jtreg/graal |
685 |
||
47986 | 686 |
ifneq ($$(JTREG_FAILURE_HANDLER_OPTIONS), ) |
687 |
$1_JTREG_LAUNCHER_OPTIONS += -Djava.library.path="$(JTREG_FAILURE_HANDLER_DIR)" |
|
688 |
endif |
|
689 |
||
47939
fe7596497fb0
8179555: make run-test should always use a fresh, clean JTwork directory
ihse
parents:
47938
diff
changeset
|
690 |
clean-workdir-$1: |
fe7596497fb0
8179555: make run-test should always use a fresh, clean JTwork directory
ihse
parents:
47938
diff
changeset
|
691 |
$$(RM) -r $$($1_TEST_SUPPORT_DIR) |
fe7596497fb0
8179555: make run-test should always use a fresh, clean JTwork directory
ihse
parents:
47938
diff
changeset
|
692 |
|
fe7596497fb0
8179555: make run-test should always use a fresh, clean JTwork directory
ihse
parents:
47938
diff
changeset
|
693 |
run-test-$1: clean-workdir-$1 |
44027 | 694 |
$$(call LogWarn) |
695 |
$$(call LogWarn, Running test '$$($1_TEST)') |
|
696 |
$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
|
697 |
$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, \ |
|
698 |
$$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \ |
|
699 |
-Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \ |
|
700 |
$$($1_JTREG_BASIC_OPTIONS) \ |
|
701 |
-testjdk:$$(JDK_IMAGE_DIR) \ |
|
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
702 |
-dir:$$(JTREG_TOPDIR) \ |
44027 | 703 |
-reportDir:$$($1_TEST_RESULTS_DIR) \ |
704 |
-workDir:$$($1_TEST_SUPPORT_DIR) \ |
|
705 |
$$(JTREG_OPTIONS) \ |
|
47986 | 706 |
$$(JTREG_FAILURE_HANDLER_OPTIONS) \ |
48042 | 707 |
$$($1_TEST_NAME) \ |
708 |
&& $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
|
709 |
|| $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
|
710 |
) |
|
44027 | 711 |
|
712 |
$1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt |
|
713 |
||
714 |
parse-test-$1: run-test-$1 |
|
715 |
$$(call LogWarn, Finished running test '$$($1_TEST)') |
|
716 |
$$(call LogWarn, Test report is stored in $$(strip \ |
|
717 |
$$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR)))) |
|
48042 | 718 |
$$(if $$(wildcard $$($1_RESULT_FILE)), \ |
47259
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
719 |
$$(eval $1_PASSED := $$(shell $$(AWK) '{ gsub(/[,;]/, ""); \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
720 |
for (i=1; i<=NF; i++) { if ($$$$i == "passed:") \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
721 |
print $$$$(i+1) } }' $$($1_RESULT_FILE))) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
722 |
$$(if $$($1_PASSED), , $$(eval $1_PASSED := 0)) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
723 |
$$(eval $1_FAILED := $$(shell $$(AWK) '{gsub(/[,;]/, ""); \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
724 |
for (i=1; i<=NF; i++) { if ($$$$i == "failed:") \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
725 |
print $$$$(i+1) } }' $$($1_RESULT_FILE))) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
726 |
$$(if $$($1_FAILED), , $$(eval $1_FAILED := 0)) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
727 |
$$(eval $1_ERROR := $$(shell $$(AWK) '{gsub(/[,;]/, ""); \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
728 |
for (i=1; i<=NF; i++) { if ($$$$i == "error:") \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
729 |
print $$$$(i+1) } }' $$($1_RESULT_FILE))) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
730 |
$$(if $$($1_ERROR), , $$(eval $1_ERROR := 0)) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
731 |
$$(eval $1_TOTAL := $$(shell \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
732 |
$$(EXPR) $$($1_PASSED) + $$($1_FAILED) + $$($1_ERROR))) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
733 |
, \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
734 |
$$(eval $1_PASSED := 0) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
735 |
$$(eval $1_FAILED := 0) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
736 |
$$(eval $1_ERROR := 1) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
737 |
$$(eval $1_TOTAL := 1) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
738 |
) |
44027 | 739 |
|
740 |
$1: run-test-$1 parse-test-$1 |
|
741 |
||
742 |
TARGETS += $1 |
|
743 |
endef |
|
744 |
||
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
745 |
################################################################################ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
746 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
747 |
### Rules for special tests |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
748 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
749 |
SetupRunSpecialTest = $(NamedParamsMacroTemplate) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
750 |
define SetupRunSpecialTestBody |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
751 |
$1_TEST_RESULTS_DIR := $$(TEST_RESULTS_DIR)/$1 |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
752 |
$1_TEST_SUPPORT_DIR := $$(TEST_SUPPORT_DIR)/$1 |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
753 |
$1_EXITCODE := $$($1_TEST_RESULTS_DIR)/exitcode.txt |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
754 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
755 |
$1_FULL_TEST_NAME := $$(strip $$(patsubst special:%, %, $$($1_TEST))) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
756 |
ifneq ($$(findstring :, $$($1_FULL_TEST_NAME)), ) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
757 |
$1_TEST_NAME := $$(firstword $$(subst :, ,$$($1_FULL_TEST_NAME))) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
758 |
$1_TEST_ARGS := $$(strip $$(patsubst special:$$($1_TEST_NAME):%, %, $$($1_TEST))) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
759 |
else |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
760 |
$1_TEST_NAME := $$($1_FULL_TEST_NAME) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
761 |
$1_TEST_ARGS := |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
762 |
endif |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
763 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
764 |
ifeq ($$($1_TEST_NAME), hotspot-internal) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
765 |
$1_TEST_COMMAND_LINE := \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
766 |
$$(JDK_IMAGE_DIR)/bin/java -XX:+ExecuteInternalVMTests \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
767 |
-XX:+ShowMessageBoxOnError -version |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
768 |
else ifeq ($$($1_TEST_NAME), failure-handler) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
769 |
$1_TEST_COMMAND_LINE := \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
770 |
($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
771 |
BuildFailureHandler.gmk test) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
772 |
else ifeq ($$($1_TEST_NAME), make) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
773 |
$1_TEST_COMMAND_LINE := \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
774 |
($(CD) $(TOPDIR)/test/make && $(MAKE) $(MAKE_ARGS) -f \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
775 |
TestMake.gmk $$($1_TEST_ARGS)) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
776 |
else |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
777 |
$$(error Invalid special test specification: $$($1_TEST_NAME)) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
778 |
endif |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
779 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
780 |
run-test-$1: |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
781 |
$$(call LogWarn) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
782 |
$$(call LogWarn, Running test '$$($1_TEST)') |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
783 |
$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
784 |
$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
785 |
$$($1_TEST_COMMAND_LINE) \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
786 |
> >($(TEE) $$($1_TEST_RESULTS_DIR)/test-output.txt) \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
787 |
&& $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
788 |
|| $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
789 |
) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
790 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
791 |
$1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
792 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
793 |
# We can not parse the various "special" tests. |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
794 |
parse-test-$1: run-test-$1 |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
795 |
$$(call LogWarn, Finished running test '$$($1_TEST)') |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
796 |
$$(call LogWarn, Test report is stored in $$(strip \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
797 |
$$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR)))) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
798 |
$$(call LogWarn, Warning: Special test results are not properly parsed!) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
799 |
$$(eval $1_PASSED := 0) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
800 |
$$(eval $1_FAILED := 0) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
801 |
$$(eval $1_ERROR := 0) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
802 |
$$(eval $1_TOTAL := 0) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
803 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
804 |
$1: run-test-$1 parse-test-$1 |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
805 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
806 |
TARGETS += $1 |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
807 |
endef |
44027 | 808 |
|
809 |
################################################################################ |
|
810 |
# Setup and execute make rules for all selected tests |
|
811 |
################################################################################ |
|
812 |
||
813 |
# Helper function to determine which handler to use for the given test |
|
814 |
UseGtestTestHandler = \ |
|
815 |
$(if $(filter gtest:%, $1), true) |
|
816 |
||
56920
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
817 |
UseMicroTestHandler = \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
818 |
$(if $(filter micro:%, $1), true) |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
819 |
|
44027 | 820 |
UseJtregTestHandler = \ |
821 |
$(if $(filter jtreg:%, $1), true) |
|
822 |
||
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
823 |
UseSpecialTestHandler = \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
824 |
$(if $(filter special:%, $1), true) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
825 |
|
44027 | 826 |
# Now process each test to run and setup a proper make rule |
827 |
$(foreach test, $(TESTS_TO_RUN), \ |
|
828 |
$(eval TEST_ID := $(shell $(ECHO) $(strip $(test)) | \ |
|
48042 | 829 |
$(TR) -cs '[a-z][A-Z][0-9]\n' '[_*1000]')) \ |
44027 | 830 |
$(eval ALL_TEST_IDS += $(TEST_ID)) \ |
831 |
$(if $(call UseCustomTestHandler, $(test)), \ |
|
832 |
$(eval $(call SetupRunCustomTest, $(TEST_ID), \ |
|
833 |
TEST := $(test), \ |
|
834 |
)) \ |
|
835 |
) \ |
|
836 |
$(if $(call UseGtestTestHandler, $(test)), \ |
|
837 |
$(eval $(call SetupRunGtestTest, $(TEST_ID), \ |
|
838 |
TEST := $(test), \ |
|
839 |
)) \ |
|
840 |
) \ |
|
56920
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
841 |
$(if $(call UseMicroTestHandler, $(test)), \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
842 |
$(eval $(call SetupRunMicroTest, $(TEST_ID), \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
843 |
TEST := $(test), \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
844 |
)) \ |
e0750e33f818
Add support for running microbenchmarks using run-test.
ihse
parents:
51856
diff
changeset
|
845 |
) \ |
44027 | 846 |
$(if $(call UseJtregTestHandler, $(test)), \ |
847 |
$(eval $(call SetupRunJtregTest, $(TEST_ID), \ |
|
848 |
TEST := $(test), \ |
|
849 |
)) \ |
|
850 |
) \ |
|
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
851 |
$(if $(call UseSpecialTestHandler, $(test)), \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
852 |
$(eval $(call SetupRunSpecialTest, $(TEST_ID), \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
853 |
TEST := $(test), \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
854 |
)) \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
855 |
) \ |
44027 | 856 |
) |
857 |
||
858 |
# Sort also removes duplicates, so if there is any we'll get fewer words. |
|
859 |
ifneq ($(words $(ALL_TEST_IDS)), $(words $(sort $(ALL_TEST_IDS)))) |
|
860 |
$(error Duplicate test specification) |
|
861 |
endif |
|
862 |
||
863 |
||
864 |
################################################################################ |
|
865 |
# The main target for RunTests.gmk |
|
866 |
################################################################################ |
|
867 |
||
868 |
# The SetupRun*Test functions have populated TARGETS. |
|
869 |
||
870 |
TEST_FAILURE := false |
|
871 |
||
872 |
run-test: $(TARGETS) |
|
47943 | 873 |
# Create and print a table of the result of all tests run |
874 |
$(RM) $(TEST_SUMMARY).old 2> /dev/null |
|
875 |
$(MV) $(TEST_SUMMARY) $(TEST_SUMMARY).old 2> /dev/null || true |
|
48042 | 876 |
$(RM) $(TEST_LAST_IDS).old 2> /dev/null |
877 |
$(MV) $(TEST_LAST_IDS) $(TEST_LAST_IDS).old 2> /dev/null || true |
|
47943 | 878 |
$(ECHO) >> $(TEST_SUMMARY) ============================== |
879 |
$(ECHO) >> $(TEST_SUMMARY) Test summary |
|
880 |
$(ECHO) >> $(TEST_SUMMARY) ============================== |
|
881 |
$(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5s %5s %5s %5s %2s\n" " " \ |
|
882 |
TEST TOTAL PASS FAIL ERROR " " |
|
44027 | 883 |
$(foreach test, $(TESTS_TO_RUN), \ |
884 |
$(eval TEST_ID := $(shell $(ECHO) $(strip $(test)) | \ |
|
48042 | 885 |
$(TR) -cs '[a-z][A-Z][0-9]\n' '[_*1000]')) \ |
886 |
$(ECHO) >> $(TEST_LAST_IDS) $(TEST_ID) $(NEWLINE) \ |
|
887 |
$(eval NAME_PATTERN := $(shell $(ECHO) $(test) | $(TR) -c '\n' '[_*1000]')) \ |
|
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
888 |
$(if $(filter __________________________________________________%, $(NAME_PATTERN)), \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
889 |
$(eval TEST_NAME := ) \ |
47943 | 890 |
$(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s\n" " " "$(test)" $(NEWLINE) \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
891 |
, \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
892 |
$(eval TEST_NAME := $(test)) \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
893 |
) \ |
44027 | 894 |
$(if $(filter $($(TEST_ID)_PASSED), $($(TEST_ID)_TOTAL)), \ |
47943 | 895 |
$(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5d %5d %5d %5d %2s\n" \ |
896 |
" " "$(TEST_NAME)" $($(TEST_ID)_TOTAL) $($(TEST_ID)_PASSED) \ |
|
897 |
$($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR) " " $(NEWLINE) \ |
|
44027 | 898 |
, \ |
47943 | 899 |
$(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5d %5d %5d %5d %2s\n" \ |
900 |
">>" "$(TEST_NAME)" $($(TEST_ID)_TOTAL) $($(TEST_ID)_PASSED) \ |
|
901 |
$($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR) "<<" $(NEWLINE) \ |
|
44027 | 902 |
$(eval TEST_FAILURE := true) \ |
903 |
) \ |
|
904 |
) |
|
47943 | 905 |
$(ECHO) >> $(TEST_SUMMARY) ============================== |
44027 | 906 |
$(if $(filter true, $(TEST_FAILURE)), \ |
47943 | 907 |
$(ECHO) >> $(TEST_SUMMARY) TEST FAILURE $(NEWLINE) \ |
908 |
$(MKDIR) -p $(MAKESUPPORT_OUTPUTDIR) $(NEWLINE) \ |
|
44027 | 909 |
$(TOUCH) $(MAKESUPPORT_OUTPUTDIR)/exit-with-error \ |
910 |
, \ |
|
47943 | 911 |
$(ECHO) >> $(TEST_SUMMARY) TEST SUCCESS \ |
44027 | 912 |
) |
913 |
$(ECHO) |
|
47943 | 914 |
$(CAT) $(TEST_SUMMARY) |
915 |
$(ECHO) |
|
44027 | 916 |
|
917 |
################################################################################ |
|
918 |
||
919 |
all: run-test |
|
920 |
||
921 |
.PHONY: default all run-test $(TARGETS) |