author | dcubed |
Fri, 15 Nov 2019 18:31:55 -0500 | |
changeset 59117 | 8f92795b39e5 |
parent 58754 | f67f4674b466 |
child 59120 | fc68b2cdfeeb |
permissions | -rw-r--r-- |
44027 | 1 |
# |
53295
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
2 |
# Copyright (c) 2016, 2019, 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, \ |
53464 | 48 |
SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR JCOV, \ |
49 |
STRING_KEYWORDS := VM_OPTIONS JAVA_OPTIONS AOT_MODULES, \ |
|
47956
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 |
53683 | 64 |
ifeq ($(call isTargetOs, windows), true) |
49147
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 := \ |
52295
57d299cdd068
8213005: Missing symbols in hs_err files on Windows after JDK-8212028
erikj
parents:
52125
diff
changeset
|
68 |
$(subst $(SPACE),;,$(strip \ |
57d299cdd068
8213005: Missing symbols in hs_err files on Windows after JDK-8212028
erikj
parents:
52125
diff
changeset
|
69 |
$(foreach p, $(sort $(dir $(wildcard \ |
57d299cdd068
8213005: Missing symbols in hs_err files on Windows after JDK-8212028
erikj
parents:
52125
diff
changeset
|
70 |
$(addprefix $(SYMBOLS_IMAGE_DIR)/bin/, *.pdb */*.pdb)))), \ |
57d299cdd068
8213005: Missing symbols in hs_err files on Windows after JDK-8212028
erikj
parents:
52125
diff
changeset
|
71 |
$(call FixPath, $p) \ |
57d299cdd068
8213005: Missing symbols in hs_err files on Windows after JDK-8212028
erikj
parents:
52125
diff
changeset
|
72 |
) \ |
57d299cdd068
8213005: Missing symbols in hs_err files on Windows after JDK-8212028
erikj
parents:
52125
diff
changeset
|
73 |
)) |
49147
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
74 |
export _NT_SYMBOL_PATH |
53485 | 75 |
$(call LogDebug, Rewriting _NT_SYMBOL_PATH to $(_NT_SYMBOL_PATH)) |
49147
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
76 |
endif |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
77 |
endif |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
78 |
|
47956
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
79 |
################################################################################ |
44027 | 80 |
# Hook to include the corresponding custom file, if present. |
47314 | 81 |
$(eval $(call IncludeCustomExtension, RunTests.gmk)) |
47956
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
82 |
################################################################################ |
44027 | 83 |
|
53485 | 84 |
# This is the JDK that we will test |
85 |
JDK_UNDER_TEST := $(JDK_IMAGE_DIR) |
|
86 |
||
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47218
diff
changeset
|
87 |
TEST_RESULTS_DIR := $(OUTPUTDIR)/test-results |
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47218
diff
changeset
|
88 |
TEST_SUPPORT_DIR := $(OUTPUTDIR)/test-support |
47943 | 89 |
TEST_SUMMARY := $(TEST_RESULTS_DIR)/test-summary.txt |
48042 | 90 |
TEST_LAST_IDS := $(TEST_SUPPORT_DIR)/test-last-ids.txt |
44027 | 91 |
|
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
92 |
ifeq ($(CUSTOM_ROOT), ) |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
93 |
JTREG_TOPDIR := $(TOPDIR) |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
94 |
else |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
95 |
JTREG_TOPDIR := $(CUSTOM_ROOT) |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
96 |
endif |
44027 | 97 |
|
47986 | 98 |
JTREG_FAILURE_HANDLER_DIR := $(TEST_IMAGE_DIR)/failure_handler |
99 |
JTREG_FAILURE_HANDLER := $(JTREG_FAILURE_HANDLER_DIR)/jtregFailureHandler.jar |
|
100 |
||
58075
6488adc963b8
8230781: Add JTREG_FAILURE_HANDLER_TIMEOUT to control timeout handler timeout
lmesnik
parents:
57681
diff
changeset
|
101 |
JTREG_FAILURE_HANDLER_TIMEOUT ?= 0 |
6488adc963b8
8230781: Add JTREG_FAILURE_HANDLER_TIMEOUT to control timeout handler timeout
lmesnik
parents:
57681
diff
changeset
|
102 |
|
47986 | 103 |
ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), ) |
104 |
JTREG_FAILURE_HANDLER_OPTIONS := \ |
|
105 |
-timeoutHandlerDir:$(JTREG_FAILURE_HANDLER) \ |
|
106 |
-observerDir:$(JTREG_FAILURE_HANDLER) \ |
|
107 |
-timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
|
108 |
-observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ |
|
58075
6488adc963b8
8230781: Add JTREG_FAILURE_HANDLER_TIMEOUT to control timeout handler timeout
lmesnik
parents:
57681
diff
changeset
|
109 |
-timeoutHandlerTimeout:$(JTREG_FAILURE_HANDLER_TIMEOUT) |
47986 | 110 |
endif |
111 |
||
53464 | 112 |
GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, \ |
113 |
$(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher)) |
|
114 |
GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, \ |
|
115 |
$(GTEST_LAUNCHER_DIRS))) |
|
48058
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
116 |
|
53857 | 117 |
COV_ENVIRONMENT := |
118 |
JTREG_COV_OPTIONS := |
|
119 |
||
53485 | 120 |
ifeq ($(TEST_OPTS_JCOV), true) |
121 |
JCOV_OUTPUT_DIR := $(TEST_RESULTS_DIR)/jcov-output |
|
122 |
JCOV_GRABBER_LOG := $(JCOV_OUTPUT_DIR)/grabber.log |
|
123 |
JCOV_RESULT_FILE := $(JCOV_OUTPUT_DIR)/result.xml |
|
124 |
JCOV_REPORT := $(JCOV_OUTPUT_DIR)/report |
|
125 |
JCOV_MEM_OPTIONS := -Xms64m -Xmx4g |
|
126 |
||
53526
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53485
diff
changeset
|
127 |
# Replace our normal test JDK with the JCov image. |
688ce88f89cd
8217761: Enhance run-test-prebuilt jib profile to support running tests with JCov
shurailine
parents:
53485
diff
changeset
|
128 |
JDK_UNDER_TEST := $(JCOV_IMAGE_DIR) |
53485 | 129 |
|
53857 | 130 |
COV_ENVIRONMENT += JAVA_TOOL_OPTIONS="$(JCOV_MEM_OPTIONS)" \ |
53485 | 131 |
_JAVA_OPTIONS="$(JCOV_MEM_OPTIONS)" |
53857 | 132 |
JTREG_COV_OPTIONS += -e:JAVA_TOOL_OPTIONS='$(JCOV_MEM_OPTIONS)' \ |
53485 | 133 |
-e:_JAVA_OPTIONS='$(JCOV_MEM_OPTIONS)' |
134 |
endif |
|
135 |
||
53857 | 136 |
ifeq ($(GCOV_ENABLED), true) |
137 |
GCOV_OUTPUT_DIR := $(TEST_RESULTS_DIR)/gcov-output |
|
138 |
COV_ENVIRONMENT += GCOV_PREFIX="$(GCOV_OUTPUT_DIR)" |
|
139 |
JTREG_COV_OPTIONS += -e:GCOV_PREFIX="$(GCOV_OUTPUT_DIR)" |
|
140 |
endif |
|
141 |
||
44027 | 142 |
################################################################################ |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
143 |
# Optionally create AOT libraries for specified modules before running tests. |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
144 |
# Note, this could not be done during JDK build time. |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
145 |
################################################################################ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
146 |
|
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
147 |
# Note, this could not be done during JDK build time. |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
148 |
|
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
149 |
# Parameter 1 is the name of the rule. |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
150 |
# |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
151 |
# Remaining parameters are named arguments. |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
152 |
# MODULE The module to generate a library for |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
153 |
# BIN Output directory in which to put the library |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
154 |
# VM_OPTIONS List of JVM arguments to use when creating library |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
155 |
# OPTIONS_VAR Name of variable to put AOT java options in |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
156 |
# PREREQS_VAR Name of variable to put all AOT prerequisite rule targets in |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
157 |
# for test rules to depend on |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
158 |
# |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
159 |
SetupAotModule = $(NamedParamsMacroTemplate) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
160 |
define SetupAotModuleBody |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
161 |
$1_AOT_LIB := $$($1_BIN)/$$(call SHARED_LIBRARY,$$($1_MODULE)) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
162 |
$1_AOT_CCLIST := $$(wildcard $$(TOPDIR)/test/hotspot/jtreg/compiler/aot/scripts/$$($1_MODULE)-list.txt) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
163 |
|
52790
290b04fd1846
8214557: Filter out VM flags which don't affect AOT code generation
epavlova
parents:
52595
diff
changeset
|
164 |
# Create jaotc flags. |
53464 | 165 |
# VM flags which don't affect AOT code generation are filtered out: |
166 |
# -Xcomp, -XX:+-TieredCompilation |
|
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
167 |
$1_JAOTC_OPTS := \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
168 |
-J-Xmx4g --info \ |
52790
290b04fd1846
8214557: Filter out VM flags which don't affect AOT code generation
epavlova
parents:
52595
diff
changeset
|
169 |
$$(addprefix -J, $$(filter-out -Xcomp %TieredCompilation, $$($1_VM_OPTIONS))) \ |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
170 |
$$(addprefix --compile-commands$(SPACE), $$($1_AOT_CCLIST)) \ |
53460
65c813da7c65
8217613: [AOT] TEST_OPTS_AOT_MODULES doesn't work on mac
erikj
parents:
53295
diff
changeset
|
171 |
--linker-path $$(LD_JAOTC) \ |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
172 |
# |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
173 |
|
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
174 |
ifneq ($$(filter -ea, $$($1_VM_OPTIONS)), ) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
175 |
$1_JAOTC_OPTS += --compile-with-assertions |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
176 |
endif |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
177 |
|
53485 | 178 |
$$($1_AOT_LIB): $$(JDK_UNDER_TEST)/release \ |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
179 |
$$(call DependOnVariable, $1_JAOTC_OPTS) \ |
53485 | 180 |
$$(call DependOnVariable, JDK_UNDER_TEST) |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
181 |
$$(call LogWarn, Generating $$(patsubst $$(OUTPUTDIR)/%, %, $$@)) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
182 |
$$(call MakeTargetDir) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
183 |
$$(call ExecuteWithLog, $$@, \ |
53857 | 184 |
$((COV_ENVIRONMENT) \ |
53485 | 185 |
$$(FIXPATH) $$(JDK_UNDER_TEST)/bin/jaotc \ |
53460
65c813da7c65
8217613: [AOT] TEST_OPTS_AOT_MODULES doesn't work on mac
erikj
parents:
53295
diff
changeset
|
186 |
$$($1_JAOTC_OPTS) --output $$@ --module $$($1_MODULE) \ |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
187 |
) |
58754
f67f4674b466
8232834: RunTest sometimes fails to produce valid exitcode.txt
erikj
parents:
58075
diff
changeset
|
188 |
$$(call ExecuteWithLog, $$@.check, ( \ |
53485 | 189 |
$$(FIXPATH) $$(JDK_UNDER_TEST)/bin/java \ |
57681 | 190 |
$$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions \ |
53460
65c813da7c65
8217613: [AOT] TEST_OPTS_AOT_MODULES doesn't work on mac
erikj
parents:
53295
diff
changeset
|
191 |
-XX:+PrintAOT -XX:+UseAOTStrictLoading \ |
65c813da7c65
8217613: [AOT] TEST_OPTS_AOT_MODULES doesn't work on mac
erikj
parents:
53295
diff
changeset
|
192 |
-XX:AOTLibrary=$$@ -version \ |
65c813da7c65
8217613: [AOT] TEST_OPTS_AOT_MODULES doesn't work on mac
erikj
parents:
53295
diff
changeset
|
193 |
> $$@.verify-aot \ |
58754
f67f4674b466
8232834: RunTest sometimes fails to produce valid exitcode.txt
erikj
parents:
58075
diff
changeset
|
194 |
)) |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
195 |
|
57681 | 196 |
$1_AOT_OPTIONS += -XX:+UnlockExperimentalVMOptions |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
197 |
$1_AOT_OPTIONS += -XX:AOTLibrary=$$($1_AOT_LIB) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
198 |
$1_AOT_TARGETS += $$($1_AOT_LIB) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
199 |
endef |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
200 |
|
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
201 |
# Parameter 1 is the name of the rule. |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
202 |
# |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
203 |
# Remaining parameters are named arguments. |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
204 |
# MODULES The modules to generate a library for |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
205 |
# VM_OPTIONS List of JVM arguments to use when creating libraries |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
206 |
# |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
207 |
# After calling this, the following variables are defined |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
208 |
# $1_AOT_OPTIONS List of all java options needed to use the AOT libraries |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
209 |
# $1_AOT_TARGETS List of all targets that the test rule will need to depend on |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
210 |
# |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
211 |
SetupAot = $(NamedParamsMacroTemplate) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
212 |
define SetupAotBody |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
213 |
$$(info Running with AOTd libraries for $$($1_MODULES)) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
214 |
# Put aot libraries in a separate directory so they are not deleted between |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
215 |
# test runs and may be reused between make invocations. |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
216 |
$$(foreach m, $$($1_MODULES), \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
217 |
$$(eval $$(call SetupAotModule, $1_$$m, \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
218 |
MODULE := $$m, \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
219 |
BIN := $$(TEST_SUPPORT_DIR)/aot/$1, \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
220 |
VM_OPTIONS := $$($1_VM_OPTIONS), \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
221 |
)) \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
222 |
$$(eval $1_AOT_OPTIONS += $$($1_$$m_AOT_OPTIONS)) \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
223 |
$$(eval $1_AOT_TARGETS += $$($1_$$m_AOT_TARGETS)) \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
224 |
) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
225 |
endef |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
226 |
|
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
227 |
################################################################################ |
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
228 |
# Setup global test running parameters |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
229 |
################################################################################ |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
230 |
|
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
231 |
# Each factor variable comes in 3 variants. The first one is reserved for users |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
232 |
# to use on command line. The other two are for predifined configurations in JDL |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
233 |
# and for machine specific configurations respectively. |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
234 |
TEST_JOBS_FACTOR ?= 1 |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
235 |
TEST_JOBS_FACTOR_JDL ?= 1 |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
236 |
TEST_JOBS_FACTOR_MACHINE ?= 1 |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
237 |
|
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
238 |
ifeq ($(TEST_JOBS), 0) |
52556
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
239 |
CORES_DIVIDER := 2 |
53683 | 240 |
ifeq ($(call isTargetCpuArch, sparc), true) |
52556
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
241 |
# For smaller SPARC machines we see reasonable scaling of throughput up to |
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
242 |
# cpus/4 without affecting test reliability. On the bigger machines, cpus/4 |
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
243 |
# causes intermittent timeouts. |
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
244 |
ifeq ($(shell $(EXPR) $(NUM_CORES) \> 16), 1) |
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
245 |
CORES_DIVIDER := 5 |
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
246 |
else |
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
247 |
CORES_DIVIDER := 4 |
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
248 |
endif |
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
249 |
endif |
52593
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52556
diff
changeset
|
250 |
MEMORY_DIVIDER := 2048 |
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
251 |
TEST_JOBS := $(shell $(AWK) \ |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
252 |
'BEGIN { \ |
52556
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
253 |
c = $(NUM_CORES) / $(CORES_DIVIDER); \ |
52593
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52556
diff
changeset
|
254 |
m = $(MEMORY_SIZE) / $(MEMORY_DIVIDER); \ |
8c887dcd5d90
8214003: Limit default test jobs based on memory size
erikj
parents:
52556
diff
changeset
|
255 |
if (c > m) c = m; \ |
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
256 |
c = c * $(TEST_JOBS_FACTOR); \ |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
257 |
c = c * $(TEST_JOBS_FACTOR_JDL); \ |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
258 |
c = c * $(TEST_JOBS_FACTOR_MACHINE); \ |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
259 |
if (c < 1) c = 1; \ |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
260 |
printf "%.0f", c; \ |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
261 |
}') |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
262 |
endif |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
263 |
|
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
264 |
################################################################################ |
44027 | 265 |
# Parse control variables |
266 |
################################################################################ |
|
267 |
||
47956
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
268 |
ifneq ($(TEST_OPTS), ) |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
269 |
# Inform the user |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
270 |
$(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
|
271 |
endif |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
272 |
|
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
273 |
### Jtreg |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
274 |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
275 |
$(eval $(call SetTestOpt,VM_OPTIONS,JTREG)) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
276 |
$(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG)) |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
277 |
$(eval $(call SetTestOpt,AOT_MODULES,JTREG)) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
278 |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
279 |
$(eval $(call SetTestOpt,JOBS,JTREG)) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
280 |
$(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG)) |
58075
6488adc963b8
8230781: Add JTREG_FAILURE_HANDLER_TIMEOUT to control timeout handler timeout
lmesnik
parents:
57681
diff
changeset
|
281 |
$(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG)) |
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
282 |
|
44027 | 283 |
$(eval $(call ParseKeywordVariable, JTREG, \ |
58075
6488adc963b8
8230781: Add JTREG_FAILURE_HANDLER_TIMEOUT to control timeout handler timeout
lmesnik
parents:
57681
diff
changeset
|
284 |
SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \ |
6488adc963b8
8230781: Add JTREG_FAILURE_HANDLER_TIMEOUT to control timeout handler timeout
lmesnik
parents:
57681
diff
changeset
|
285 |
TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS, \ |
53464 | 286 |
STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \ |
287 |
EXTRA_PROBLEM_LISTS AOT_MODULES, \ |
|
44027 | 288 |
)) |
289 |
||
290 |
ifneq ($(JTREG), ) |
|
291 |
# Inform the user |
|
292 |
$(info Running tests using JTREG control variable '$(JTREG)') |
|
293 |
endif |
|
294 |
||
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
295 |
### Gtest |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
296 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
297 |
$(eval $(call SetTestOpt,VM_OPTIONS,GTEST)) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
298 |
$(eval $(call SetTestOpt,JAVA_OPTIONS,GTEST)) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
299 |
$(eval $(call SetTestOpt,AOT_MODULES,GTEST)) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
300 |
|
44027 | 301 |
$(eval $(call ParseKeywordVariable, GTEST, \ |
53464 | 302 |
SINGLE_KEYWORDS := REPEAT, \ |
303 |
STRING_KEYWORDS := OPTIONS VM_OPTIONS JAVA_OPTIONS AOT_MODULES, \ |
|
44027 | 304 |
)) |
305 |
||
306 |
ifneq ($(GTEST), ) |
|
307 |
# Inform the user |
|
308 |
$(info Running tests using GTEST control variable '$(GTEST)') |
|
309 |
endif |
|
310 |
||
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
311 |
### Microbenchmarks |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
312 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
313 |
$(eval $(call SetTestOpt,VM_OPTIONS,MICRO)) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
314 |
$(eval $(call SetTestOpt,JAVA_OPTIONS,MICRO)) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
315 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
316 |
$(eval $(call ParseKeywordVariable, MICRO, \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
317 |
SINGLE_KEYWORDS := ITER FORK TIME WARMUP_ITER WARMUP_TIME, \ |
53464 | 318 |
STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS RESULTS_FORMAT TEST_JDK \ |
319 |
BENCHMARKS_JAR, \ |
|
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
320 |
)) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
321 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
322 |
ifneq ($(MICRO), ) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
323 |
# Inform the user |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
324 |
$(info Running tests using MICRO control variable '$(MICRO)') |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
325 |
endif |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
326 |
|
44027 | 327 |
|
328 |
################################################################################ |
|
329 |
# Component-specific Jtreg settings |
|
330 |
################################################################################ |
|
331 |
||
332 |
hotspot_JTREG_MAX_MEM := 0 |
|
333 |
hotspot_JTREG_ASSERT := false |
|
334 |
hotspot_JTREG_NATIVEPATH := $(TEST_IMAGE_DIR)/hotspot/jtreg/native |
|
335 |
jdk_JTREG_NATIVEPATH := $(TEST_IMAGE_DIR)/jdk/jtreg/native |
|
336 |
||
47941
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
337 |
jdk_JTREG_PROBLEM_LIST += $(TOPDIR)/test/jdk/ProblemList.txt |
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
338 |
jaxp_JTREG_PROBLEM_LIST += $(TOPDIR)/test/jaxp/ProblemList.txt |
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
339 |
langtools_JTREG_PROBLEM_LIST += $(TOPDIR)/test/langtools/ProblemList.txt |
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
340 |
nashorn_JTREG_PROBLEM_LIST += $(TOPDIR)/test/nashorn/ProblemList.txt |
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
341 |
hotspot_JTREG_PROBLEM_LIST += $(TOPDIR)/test/hotspot/jtreg/ProblemList.txt |
44027 | 342 |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
343 |
langtools_JTREG_MAX_MEM := 768m |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
344 |
|
44027 | 345 |
################################################################################ |
346 |
# Parse test selection |
|
347 |
# |
|
348 |
# The user has given a test selection in the TEST variable. We must parse it |
|
349 |
# and determine what that means in terms of actual calls to the test framework. |
|
350 |
# |
|
351 |
# The parse functions take as argument a test specification as given by the |
|
352 |
# user, and returns a fully qualified test descriptor if it was a match, or |
|
353 |
# nothing if not. A single test specification can result in multiple test |
|
354 |
# descriptors being returned. A valid test descriptor must always be accepted |
|
355 |
# and returned identically. |
|
356 |
################################################################################ |
|
357 |
||
358 |
# Helper function to determine if a test specification is a Gtest test |
|
359 |
# |
|
360 |
# 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
|
361 |
# 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
|
362 |
# variant. If no variant is specified, all found variants are tested. |
44027 | 363 |
define ParseGtestTestSelection |
364 |
$(if $(filter gtest%, $1), \ |
|
365 |
$(if $(filter gtest, $1), \ |
|
48058
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
366 |
$(addprefix gtest:all/, $(GTEST_VARIANTS)) \ |
44027 | 367 |
, \ |
48058
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
368 |
$(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
|
369 |
$(patsubst gtest:/%, gtest:all/%, $(patsubst gtest/%, gtest:/%, $1)) \ |
44027 | 370 |
, \ |
48058
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
371 |
$(if $(filter gtest:%, $1), \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
372 |
$(if $(findstring /, $1), \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
373 |
$1 \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
374 |
, \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
375 |
$(addprefix $1/, $(GTEST_VARIANTS)) \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
376 |
) \ |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
377 |
) \ |
44027 | 378 |
) \ |
379 |
) \ |
|
380 |
) |
|
381 |
endef |
|
382 |
||
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
383 |
# Helper function to determine if a test specification is a microbenchmark test |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
384 |
# |
53464 | 385 |
# It is a microbenchmark test if it is either "micro", or "micro:" followed by |
386 |
# an optional test filter string. |
|
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
387 |
define ParseMicroTestSelection |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
388 |
$(if $(filter micro%, $1), \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
389 |
$(if $(filter micro, $1), \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
390 |
micro:all \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
391 |
, \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
392 |
$(if $(filter micro:, $1), \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
393 |
micro:all \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
394 |
, \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
395 |
$1 \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
396 |
) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
397 |
) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
398 |
) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
399 |
endef |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
400 |
|
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
401 |
# 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
|
402 |
CleanupJtregPath = \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
403 |
$(strip $(patsubst %/, %, $(subst $(JTREG_TOPDIR)/,, $1))) |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
404 |
|
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
405 |
# 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
|
406 |
# 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
|
407 |
ExpandJtregRoot = \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
408 |
$(call CleanupJtregPath, $(wildcard \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
409 |
$(if $(filter /%, $1), \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
410 |
$(if $(wildcard $(strip $1)/TEST.ROOT), \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
411 |
$1 \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
412 |
) \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
413 |
, \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
414 |
$(filter $(addprefix %, $1), $(JTREG_TESTROOTS) $(addsuffix /, $(JTREG_TESTROOTS))) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
415 |
$(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
|
416 |
) \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
417 |
)) |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
418 |
|
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
419 |
# 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
|
420 |
# 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
|
421 |
ExpandJtregPath = \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
422 |
$(if $(call ExpandJtregRoot, $1), \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
423 |
$(call ExpandJtregRoot, $1) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
424 |
, \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
425 |
$(call CleanupJtregPath, $(wildcard \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
426 |
$(if $(filter /%, $1), \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
427 |
$1 \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
428 |
, \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
429 |
$(addsuffix /$(strip $1), $(JTREG_TESTROOTS) $(TEST_BASEDIRS)) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
430 |
$(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
|
431 |
) \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
432 |
)) \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
433 |
) |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
434 |
|
44027 | 435 |
# Helper function to determine if a test specification is a Jtreg test |
436 |
# |
|
437 |
# It is a Jtreg test if it optionally begins with jtreg:, and then is either |
|
438 |
# 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
|
439 |
# 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
|
440 |
# either absolute or relative to any of the TEST_BASEDIRS or test roots. |
44027 | 441 |
define ParseJtregTestSelection |
442 |
$(eval TEST_NAME := $(strip $(patsubst jtreg:%, %, $1))) \ |
|
443 |
$(if $(or $(findstring :, $(TEST_NAME)), $(findstring /, $(TEST_NAME))), , \ |
|
444 |
$(eval TEST_NAME := :$(TEST_NAME)) \ |
|
445 |
) \ |
|
446 |
$(if $(findstring :, $(TEST_NAME)), \ |
|
447 |
$(if $(filter :%, $(TEST_NAME)), \ |
|
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
448 |
$(eval TEST_GROUP := $(patsubst :%, %, $(TEST_NAME))) \ |
48042 | 449 |
$(eval TEST_ROOTS := $(foreach test_root, $(JTREG_TESTROOTS), \ |
450 |
$(call CleanupJtregPath, $(test_root)))) \ |
|
44027 | 451 |
, \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
452 |
$(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
|
453 |
$(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
|
454 |
$(eval TEST_ROOTS := $(call ExpandJtregRoot, $(TEST_PATH))) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
455 |
) \ |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
456 |
$(foreach test_root, $(TEST_ROOTS), \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
457 |
$(if $(filter /%, $(test_root)), \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
458 |
jtreg:$(test_root):$(TEST_GROUP) \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
459 |
, \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
460 |
$(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
|
461 |
jtreg:$(test_root):$(TEST_GROUP) \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
462 |
) \ |
44027 | 463 |
) \ |
464 |
) \ |
|
465 |
, \ |
|
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
466 |
$(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
|
467 |
$(foreach test_path, $(TEST_PATHS), \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
468 |
jtreg:$(test_path) \ |
44027 | 469 |
) \ |
470 |
) |
|
471 |
endef |
|
472 |
||
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
473 |
# 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
|
474 |
# |
52342 | 475 |
# It is a special test if it is "special:" followed by a test name, |
53464 | 476 |
# if it is "make:" or "make-" followed by a make test, or any of the special |
477 |
# test names as a single word. |
|
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
478 |
define ParseSpecialTestSelection |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
479 |
$(if $(filter special:%, $1), \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
480 |
$1 \ |
52342 | 481 |
) \ |
482 |
$(if $(filter make%, $1), \ |
|
483 |
$(if $(filter make:%, $1), \ |
|
484 |
special:$(strip $1) \ |
|
485 |
) \ |
|
486 |
$(if $(filter make-%, $1), \ |
|
487 |
special:$(patsubst make-%,make:%, $1) \ |
|
488 |
) \ |
|
489 |
$(if $(filter make, $1), \ |
|
490 |
special:make:all \ |
|
491 |
) |
|
492 |
) \ |
|
52396
e292e94b448a
8213058: remove ExecuteInternalVMTests and VerboseInternalVMTests flags
iignatyev
parents:
52393
diff
changeset
|
493 |
$(if $(filter failure-handler, $1), \ |
52342 | 494 |
special:$(strip $1) \ |
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
495 |
) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
496 |
endef |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
497 |
|
44027 | 498 |
ifeq ($(TEST), ) |
499 |
$(info No test selection given in TEST!) |
|
52342 | 500 |
$(info Please use e.g. 'make test TEST=tier1' or 'make test-tier1') |
47928
fb62d4519338
8191715: Update documentation pointing to "common" directory
ihse
parents:
47329
diff
changeset
|
501 |
$(info See doc/testing.[md|html] for help) |
44027 | 502 |
$(error Cannot continue) |
503 |
endif |
|
504 |
||
505 |
# Now intelligently convert the test selection given by the user in TEST |
|
506 |
# into a list of fully qualified test descriptors of the tests to run. |
|
507 |
TESTS_TO_RUN := |
|
508 |
$(foreach test, $(TEST), \ |
|
509 |
$(eval PARSED_TESTS := $(call ParseCustomTestSelection, $(test))) \ |
|
510 |
$(if $(strip $(PARSED_TESTS)), , \ |
|
511 |
$(eval PARSED_TESTS += $(call ParseGtestTestSelection, $(test))) \ |
|
512 |
) \ |
|
513 |
$(if $(strip $(PARSED_TESTS)), , \ |
|
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
514 |
$(eval PARSED_TESTS += $(call ParseMicroTestSelection, $(test))) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
515 |
) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
516 |
$(if $(strip $(PARSED_TESTS)), , \ |
44027 | 517 |
$(eval PARSED_TESTS += $(call ParseJtregTestSelection, $(test))) \ |
518 |
) \ |
|
519 |
$(if $(strip $(PARSED_TESTS)), , \ |
|
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
520 |
$(eval PARSED_TESTS += $(call ParseSpecialTestSelection, $(test))) \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
521 |
) \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
522 |
$(if $(strip $(PARSED_TESTS)), , \ |
44027 | 523 |
$(eval UNKNOWN_TEST := $(test)) \ |
524 |
) \ |
|
525 |
$(eval TESTS_TO_RUN += $(PARSED_TESTS)) \ |
|
526 |
) |
|
527 |
||
528 |
ifneq ($(UNKNOWN_TEST), ) |
|
529 |
$(info Unknown test selection: '$(UNKNOWN_TEST)') |
|
47928
fb62d4519338
8191715: Update documentation pointing to "common" directory
ihse
parents:
47329
diff
changeset
|
530 |
$(info See doc/testing.[md|html] for help) |
44027 | 531 |
$(error Cannot continue) |
532 |
endif |
|
533 |
||
534 |
TESTS_TO_RUN := $(strip $(TESTS_TO_RUN)) |
|
535 |
||
536 |
||
537 |
# Present the result of our parsing to the user |
|
538 |
$(info Test selection '$(TEST)', will run:) |
|
539 |
$(foreach test, $(TESTS_TO_RUN), $(info * $(test))) |
|
540 |
||
541 |
||
542 |
################################################################################ |
|
543 |
# Functions for setting up rules for running the selected tests |
|
544 |
# |
|
545 |
# The SetupRun*Test functions all have the same interface: |
|
546 |
# |
|
547 |
# Parameter 1 is the name of the rule. This is the test id, based on the test |
|
548 |
# descriptor, and this is also used as variable prefix, and the targets |
|
549 |
# generated are listed in a variable by that name. |
|
550 |
# |
|
551 |
# Remaining parameters are named arguments. Currently this is only: |
|
552 |
# TEST -- The properly formatted fully qualified test descriptor |
|
553 |
# |
|
554 |
# After the rule named by the test id has been executed, the following |
|
555 |
# variables will be available: |
|
556 |
# testid_TOTAL - the total number of tests run |
|
557 |
# testid_PASSED - the number of successful tests |
|
558 |
# testid_FAILED - the number of failed tests |
|
559 |
# testid_ERROR - the number of tests was neither successful or failed |
|
560 |
# |
|
561 |
################################################################################ |
|
562 |
||
563 |
### Rules for Gtest |
|
564 |
||
565 |
SetupRunGtestTest = $(NamedParamsMacroTemplate) |
|
566 |
define SetupRunGtestTestBody |
|
567 |
$1_TEST_RESULTS_DIR := $$(TEST_RESULTS_DIR)/$1 |
|
568 |
$1_TEST_SUPPORT_DIR := $$(TEST_SUPPORT_DIR)/$1 |
|
48042 | 569 |
$1_EXITCODE := $$($1_TEST_RESULTS_DIR)/exitcode.txt |
44027 | 570 |
|
48058
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
571 |
$1_VARIANT := $$(lastword $$(subst /, , $$($1_TEST))) |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
572 |
ifeq ($$(filter $$($1_VARIANT), $$(GTEST_VARIANTS)), ) |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
573 |
$$(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
|
574 |
endif |
c5eefa465e37
8192995: run-test gtest should use all jvm variants, not just "server"
ihse
parents:
48042
diff
changeset
|
575 |
$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
|
576 |
$$(patsubst gtest:%, %, $$($1_TEST)))) |
44027 | 577 |
ifneq ($$($1_TEST_NAME), all) |
578 |
$1_GTEST_FILTER := --gtest_filter=$$($1_TEST_NAME)* |
|
579 |
endif |
|
580 |
||
581 |
ifneq ($$(GTEST_REPEAT), ) |
|
582 |
$1_GTEST_REPEAT :=--gtest_repeat=$$(GTEST_REPEAT) |
|
583 |
endif |
|
584 |
||
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
585 |
ifneq ($$(GTEST_AOT_MODULES), ) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
586 |
$$(eval $$(call SetupAot, $1, \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
587 |
MODULES := $$(GTEST_AOT_MODULES), \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
588 |
VM_OPTIONS := $$(GTEST_VM_OPTIONS) $$(GTEST_JAVA_OPTIONS), \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
589 |
)) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
590 |
endif |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
591 |
|
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
592 |
run-test-$1: pre-run-test $$($1_AOT_TARGETS) |
44027 | 593 |
$$(call LogWarn) |
594 |
$$(call LogWarn, Running test '$$($1_TEST)') |
|
595 |
$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
|
58754
f67f4674b466
8232834: RunTest sometimes fails to produce valid exitcode.txt
erikj
parents:
58075
diff
changeset
|
596 |
$$(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
|
597 |
$$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \ |
53485 | 598 |
-jdk $(JDK_UNDER_TEST) $$($1_GTEST_FILTER) \ |
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
599 |
--gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \ |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
600 |
$$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \ |
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
601 |
$$(GTEST_JAVA_OPTIONS) $$($1_AOT_OPTIONS) \ |
48042 | 602 |
> >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \ |
603 |
&& $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
|
604 |
|| $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
|
58754
f67f4674b466
8232834: RunTest sometimes fails to produce valid exitcode.txt
erikj
parents:
58075
diff
changeset
|
605 |
)) |
44027 | 606 |
|
607 |
$1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt |
|
608 |
||
609 |
parse-test-$1: run-test-$1 |
|
610 |
$$(call LogWarn, Finished running test '$$($1_TEST)') |
|
611 |
$$(call LogWarn, Test report is stored in $$(strip \ |
|
612 |
$$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR)))) |
|
48042 | 613 |
$$(if $$(wildcard $$($1_RESULT_FILE)), \ |
47956
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
614 |
$$(eval $1_TOTAL := $$(shell $$(AWK) '/==========.* tests? from .* \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
615 |
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
|
616 |
$$(if $$($1_TOTAL), , $$(eval $1_TOTAL := 0)) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
617 |
$$(eval $1_PASSED := $$(shell $$(AWK) '/\[ PASSED \] .* tests?./ \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
618 |
{ print $$$$4 }' $$($1_RESULT_FILE))) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
619 |
$$(if $$($1_PASSED), , $$(eval $1_PASSED := 0)) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
620 |
$$(eval $1_FAILED := $$(shell $$(AWK) '/\[ FAILED \] .* tests?, \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
621 |
listed below/ { print $$$$4 }' $$($1_RESULT_FILE))) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
622 |
$$(if $$($1_FAILED), , $$(eval $1_FAILED := 0)) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
623 |
$$(eval $1_ERROR := $$(shell \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
624 |
$$(EXPR) $$($1_TOTAL) - $$($1_PASSED) - $$($1_FAILED))) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
625 |
, \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
626 |
$$(eval $1_PASSED := 0) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
627 |
$$(eval $1_FAILED := 0) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
628 |
$$(eval $1_ERROR := 1) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
629 |
$$(eval $1_TOTAL := 1) \ |
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47943
diff
changeset
|
630 |
) |
44027 | 631 |
|
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
632 |
$1: run-test-$1 parse-test-$1 |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
633 |
|
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
634 |
TARGETS += $1 run-test-$1 parse-test-$1 |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
635 |
TEST_TARGETS += parse-test-$1 |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
636 |
|
44027 | 637 |
endef |
638 |
||
639 |
################################################################################ |
|
640 |
||
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
641 |
### Rules for Microbenchmarks |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
642 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
643 |
# Helper function for SetupRunMicroTest. Set a MICRO_* variable from, in order: |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
644 |
# 1) Specified by user on command line |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
645 |
# 2) Generic default |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
646 |
# |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
647 |
# Note: No spaces are allowed around the arguments. |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
648 |
# Arg $1 The test ID (i.e. $1 in SetupRunMicroTest) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
649 |
# Arg $2 Base variable, e.g. MICRO_TEST_JDK |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
650 |
# Arg $3 The default value (optional) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
651 |
define SetMicroValue |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
652 |
ifneq ($$($2), ) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
653 |
$1_$2 := $$($2) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
654 |
else |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
655 |
ifneq ($3, ) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
656 |
$1_$2 := $3 |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
657 |
endif |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
658 |
endif |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
659 |
endef |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
660 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
661 |
SetupRunMicroTest = $(NamedParamsMacroTemplate) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
662 |
define SetupRunMicroTestBody |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
663 |
$1_TEST_RESULTS_DIR := $$(TEST_RESULTS_DIR)/$1 |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
664 |
$1_TEST_SUPPORT_DIR := $$(TEST_SUPPORT_DIR)/$1 |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
665 |
$1_EXITCODE := $$($1_TEST_RESULTS_DIR)/exitcode.txt |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
666 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
667 |
$1_TEST_NAME := $$(strip $$(patsubst micro:%, %, $$($1_TEST))) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
668 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
669 |
$$(eval $$(call SetMicroValue,$1,MICRO_BENCHMARKS_JAR,$$(TEST_IMAGE_DIR)/micro/benchmarks.jar)) |
53485 | 670 |
$$(eval $$(call SetMicroValue,$1,MICRO_TEST_JDK,$$(JDK_UNDER_TEST))) |
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
671 |
$$(eval $$(call SetMicroValue,$1,MICRO_JAVA_OPTIONS)) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
672 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
673 |
# Current tests needs to open java.io |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
674 |
$1_MICRO_JAVA_OPTIONS += --add-opens=java.base/java.io=ALL-UNNAMED |
53834
1b40a0178b2a
8219393: Add native library support for microbenchmarks
redestad
parents:
53683
diff
changeset
|
675 |
# Set library path for native dependencies |
1b40a0178b2a
8219393: Add native library support for microbenchmarks
redestad
parents:
53683
diff
changeset
|
676 |
$1_MICRO_JAVA_OPTIONS += -Djava.library.path=$$(TEST_IMAGE_DIR)/micro/native |
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
677 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
678 |
# Save output as JSON or CSV file |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
679 |
ifneq ($$(MICRO_RESULTS_FORMAT), ) |
53464 | 680 |
$1_MICRO_BASIC_OPTIONS += -rf $$(MICRO_RESULTS_FORMAT) |
681 |
$1_MICRO_BASIC_OPTIONS += -rff $$($1_TEST_RESULTS_DIR)/jmh-result.$(MICRO_RESULTS_FORMAT) |
|
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
682 |
endif |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
683 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
684 |
ifneq ($$(MICRO_VM_OPTIONS)$$(MICRO_JAVA_OPTIONS), ) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
685 |
$1_MICRO_VM_OPTIONS := -jvmArgs $$(MICRO_VM_OPTIONS) $$(MICRO_JAVA_OPTIONS) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
686 |
endif |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
687 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
688 |
ifneq ($$(MICRO_ITER), ) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
689 |
$1_MICRO_ITER := -i $$(MICRO_ITER) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
690 |
endif |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
691 |
ifneq ($$(MICRO_FORK), ) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
692 |
$1_MICRO_FORK := -f $$(MICRO_FORK) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
693 |
endif |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
694 |
ifneq ($$(MICRO_TIME), ) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
695 |
$1_MICRO_TIME := -r $$(MICRO_TIME) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
696 |
endif |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
697 |
ifneq ($$(MICRO_WARMUP_ITER), ) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
698 |
$1_MICRO_WARMUP_ITER := -wi $$(MICRO_WARMUP_ITER) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
699 |
endif |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
700 |
ifneq ($$(MICRO_WARMUP_TIME), ) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
701 |
$1_MICRO_WARMUP_TIME := -w $$(MICRO_WARMUP_TIME) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
702 |
endif |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
703 |
|
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
704 |
run-test-$1: pre-run-test |
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
705 |
$$(call LogWarn) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
706 |
$$(call LogWarn, Running test '$$($1_TEST)') |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
707 |
$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
58754
f67f4674b466
8232834: RunTest sometimes fails to produce valid exitcode.txt
erikj
parents:
58075
diff
changeset
|
708 |
$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/micro, ( \ |
53835
1e569f37cf36
8219394: Missing FIXPATH in microbenchmark test runner
erikj
parents:
53834
diff
changeset
|
709 |
$$(FIXPATH) $$($1_MICRO_TEST_JDK)/bin/java $$($1_MICRO_JAVA_OPTIONS) \ |
1e569f37cf36
8219394: Missing FIXPATH in microbenchmark test runner
erikj
parents:
53834
diff
changeset
|
710 |
-jar $$($1_MICRO_BENCHMARKS_JAR) \ |
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
711 |
$$($1_MICRO_ITER) $$($1_MICRO_FORK) $$($1_MICRO_TIME) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
712 |
$$($1_MICRO_WARMUP_ITER) $$($1_MICRO_WARMUP_TIME) \ |
53464 | 713 |
$$($1_MICRO_VM_OPTIONS) $$($1_MICRO_BASIC_OPTIONS) $$(MICRO_OPTIONS) \ |
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
714 |
$$($1_TEST_NAME) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
715 |
> >($(TEE) $$($1_TEST_RESULTS_DIR)/micro.txt) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
716 |
&& $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
717 |
|| $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
58754
f67f4674b466
8232834: RunTest sometimes fails to produce valid exitcode.txt
erikj
parents:
58075
diff
changeset
|
718 |
)) |
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
719 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
720 |
$1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/micro.txt |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
721 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
722 |
parse-test-$1: run-test-$1 |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
723 |
$$(call LogWarn, Finished running test '$$($1_TEST)') |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
724 |
$$(call LogWarn, Test report is stored in $$(strip \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
725 |
$$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR)))) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
726 |
$$(if $$(wildcard $$($1_EXITCODE)), \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
727 |
$$(eval $1_EXIT_CODE := $$(shell $$(CAT) $$($1_EXITCODE))) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
728 |
$$(if $$(filter 0, $$($1_EXIT_CODE)), \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
729 |
$$(eval $1_PASSED := 1) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
730 |
$$(eval $1_ERROR := 0) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
731 |
, \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
732 |
$$(eval $1_PASSED := 0) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
733 |
$$(eval $1_ERROR := 1) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
734 |
) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
735 |
$$(eval $1_FAILED := 0) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
736 |
$$(eval $1_TOTAL := $$(shell \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
737 |
$$(EXPR) $$($1_PASSED) + $$($1_ERROR))) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
738 |
, \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
739 |
$$(eval $1_PASSED := 0) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
740 |
$$(eval $1_FAILED := 0) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
741 |
$$(eval $1_ERROR := 1) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
742 |
$$(eval $1_TOTAL := 1) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
743 |
) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
744 |
|
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
745 |
$1: run-test-$1 parse-test-$1 |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
746 |
|
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
747 |
TARGETS += $1 run-test-$1 parse-test-$1 |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
748 |
TEST_TARGETS += parse-test-$1 |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
749 |
|
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
750 |
endef |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
751 |
|
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
752 |
################################################################################ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
753 |
|
44027 | 754 |
### Rules for Jtreg |
755 |
||
756 |
# Helper function for SetupRunJtregTest. Set a JTREG_* variable from, in order: |
|
757 |
# 1) Specified by user on command line |
|
758 |
# 2) Component-specific default |
|
759 |
# 3) Generic default |
|
760 |
# |
|
761 |
# Note: No spaces are allowed around the arguments. |
|
762 |
# Arg $1 The test ID (i.e. $1 in SetupRunJtregTest) |
|
763 |
# Arg $2 Base variable, e.g. JTREG_JOBS |
|
764 |
# Arg $3 The default value (optional) |
|
765 |
define SetJtregValue |
|
766 |
ifneq ($$($2), ) |
|
767 |
$1_$2 := $$($2) |
|
768 |
else |
|
769 |
ifneq ($$($$($1_COMPONENT)_$2), ) |
|
770 |
$1_$2 := $$($$($1_COMPONENT)_$2) |
|
771 |
else |
|
772 |
ifneq ($3, ) |
|
773 |
$1_$2 := $3 |
|
774 |
endif |
|
775 |
endif |
|
776 |
endif |
|
777 |
endef |
|
778 |
||
779 |
SetupRunJtregTest = $(NamedParamsMacroTemplate) |
|
780 |
define SetupRunJtregTestBody |
|
781 |
$1_TEST_RESULTS_DIR := $$(TEST_RESULTS_DIR)/$1 |
|
782 |
$1_TEST_SUPPORT_DIR := $$(TEST_SUPPORT_DIR)/$1 |
|
48042 | 783 |
$1_EXITCODE := $$($1_TEST_RESULTS_DIR)/exitcode.txt |
44027 | 784 |
|
785 |
$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
|
786 |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
787 |
$1_TEST_ROOT := \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
788 |
$$(strip $$(foreach root, $$(JTREG_TESTROOTS), \ |
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
789 |
$$(if $$(filter $$(root)%, $$(JTREG_TOPDIR)/$$($1_TEST_NAME)), $$(root)) \ |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
790 |
)) |
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
791 |
$1_COMPONENT := $$(lastword $$(subst /, $$(SPACE), $$($1_TEST_ROOT))) |
47932
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
792 |
# 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
|
793 |
ifeq ($$($1_COMPONENT), jtreg) |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
794 |
$1_COMPONENT := hotspot |
0c22f6b9b5e2
8191820: Fix run-test jtreg test selection and component calculation
ihse
parents:
47928
diff
changeset
|
795 |
endif |
44027 | 796 |
|
45104 | 797 |
ifeq ($$(JT_HOME), ) |
798 |
$$(info Error: jtreg framework is not found.) |
|
799 |
$$(info Please run configure using --with-jtreg.) |
|
800 |
$$(error Cannot continue) |
|
801 |
endif |
|
802 |
||
44027 | 803 |
# Unfortunately, we need different defaults for some JTREG values, |
804 |
# depending on what component we're running. |
|
805 |
||
806 |
# Convert JTREG_foo into $1_JTREG_foo with a suitable value. |
|
807 |
$$(eval $$(call SetJtregValue,$1,JTREG_TEST_MODE,agentvm)) |
|
808 |
$$(eval $$(call SetJtregValue,$1,JTREG_ASSERT,true)) |
|
809 |
$$(eval $$(call SetJtregValue,$1,JTREG_MAX_MEM,512m)) |
|
810 |
$$(eval $$(call SetJtregValue,$1,JTREG_NATIVEPATH)) |
|
811 |
$$(eval $$(call SetJtregValue,$1,JTREG_BASIC_OPTIONS)) |
|
47941
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
812 |
$$(eval $$(call SetJtregValue,$1,JTREG_PROBLEM_LIST)) |
44027 | 813 |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
814 |
# Only the problem list for the current test root should be used. |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
815 |
$1_JTREG_PROBLEM_LIST := $$(filter $$($1_TEST_ROOT)%, $$($1_JTREG_PROBLEM_LIST)) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
816 |
|
44027 | 817 |
ifneq ($(TEST_JOBS), 0) |
818 |
$$(eval $$(call SetJtregValue,$1,JTREG_JOBS,$$(TEST_JOBS))) |
|
819 |
else |
|
820 |
$$(eval $$(call SetJtregValue,$1,JTREG_JOBS,$$(JOBS))) |
|
821 |
endif |
|
822 |
||
47058
85aaac5701da
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46230
diff
changeset
|
823 |
# Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since |
44027 | 824 |
# 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
|
825 |
$1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS)) |
44027 | 826 |
|
52556
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
827 |
# SPARC is in general slower per core so need to scale up timeouts a bit. |
53683 | 828 |
ifeq ($(call isTargetCpuArch, sparc), true) |
52556
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
829 |
JTREG_TIMEOUT_FACTOR ?= 8 |
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
830 |
else |
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
831 |
JTREG_TIMEOUT_FACTOR ?= 4 |
6b05634db714
8211727: Adjust default concurrency settings for running tests on Sparc
erikj
parents:
52396
diff
changeset
|
832 |
endif |
44027 | 833 |
JTREG_VERBOSE ?= fail,error,summary |
834 |
JTREG_RETAIN ?= fail,error |
|
57493
b95ebdbf68ca
8226910: make it possible to use jtreg's -match via run-test framework
iignatyev
parents:
55193
diff
changeset
|
835 |
JTREG_RUN_PROBLEM_LISTS ?= false |
44027 | 836 |
|
837 |
ifneq ($$($1_JTREG_MAX_MEM), 0) |
|
838 |
$1_JTREG_BASIC_OPTIONS += -vmoption:-Xmx$$($1_JTREG_MAX_MEM) |
|
839 |
$1_JTREG_LAUNCHER_OPTIONS += -Xmx$$($1_JTREG_MAX_MEM) |
|
840 |
endif |
|
841 |
||
842 |
$1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \ |
|
843 |
-verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \ |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
844 |
-concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \ |
47058
85aaac5701da
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46230
diff
changeset
|
845 |
-vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) |
44027 | 846 |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
847 |
$1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet |
44027 | 848 |
|
47329 | 849 |
# Make it possible to specify the JIB_DATA_DIR for tests using the |
850 |
# JIB Artifact resolver |
|
851 |
$1_JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR |
|
44027 | 852 |
# Some tests needs to find a boot JDK using the JDK8_HOME variable. |
853 |
$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
|
854 |
# 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
|
855 |
# symbol lookup in hserr files |
53683 | 856 |
ifeq ($$(call isTargetOs, windows), true) |
49147
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
857 |
$1_JTREG_BASIC_OPTIONS += -e:_NT_SYMBOL_PATH |
af37d9997bd6
8199197: Set _NT_SYMBOL_PATH when running tests on windows
erikj
parents:
48061
diff
changeset
|
858 |
endif |
44027 | 859 |
|
860 |
$1_JTREG_BASIC_OPTIONS += \ |
|
861 |
$$(addprefix -javaoption:, $$(JTREG_JAVA_OPTIONS)) \ |
|
862 |
$$(addprefix -vmoption:, $$(JTREG_VM_OPTIONS)) \ |
|
863 |
# |
|
864 |
||
865 |
ifeq ($$($1_JTREG_ASSERT), true) |
|
866 |
$1_JTREG_BASIC_OPTIONS += -ea -esa |
|
867 |
endif |
|
868 |
||
869 |
ifneq ($$($1_JTREG_NATIVEPATH), ) |
|
870 |
$1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH) |
|
871 |
endif |
|
872 |
||
57493
b95ebdbf68ca
8226910: make it possible to use jtreg's -match via run-test framework
iignatyev
parents:
55193
diff
changeset
|
873 |
ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true) |
b95ebdbf68ca
8226910: make it possible to use jtreg's -match via run-test framework
iignatyev
parents:
55193
diff
changeset
|
874 |
JTREG_PROBLEM_LIST_PREFIX := -match: |
b95ebdbf68ca
8226910: make it possible to use jtreg's -match via run-test framework
iignatyev
parents:
55193
diff
changeset
|
875 |
else |
b95ebdbf68ca
8226910: make it possible to use jtreg's -match via run-test framework
iignatyev
parents:
55193
diff
changeset
|
876 |
JTREG_PROBLEM_LIST_PREFIX := -exclude: |
b95ebdbf68ca
8226910: make it possible to use jtreg's -match via run-test framework
iignatyev
parents:
55193
diff
changeset
|
877 |
endif |
b95ebdbf68ca
8226910: make it possible to use jtreg's -match via run-test framework
iignatyev
parents:
55193
diff
changeset
|
878 |
|
47941
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
879 |
ifneq ($$($1_JTREG_PROBLEM_LIST), ) |
57493
b95ebdbf68ca
8226910: make it possible to use jtreg's -match via run-test framework
iignatyev
parents:
55193
diff
changeset
|
880 |
$1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST)) |
47941
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
881 |
endif |
d91b0d2d45cb
8179554: make run-test does not respect ProblemList.txt
ihse
parents:
47939
diff
changeset
|
882 |
|
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
883 |
ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), ) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
884 |
# Accept both absolute paths as well as relative to the current test root. |
57493
b95ebdbf68ca
8226910: make it possible to use jtreg's -match via run-test framework
iignatyev
parents:
55193
diff
changeset
|
885 |
$1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \ |
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
886 |
$$(JTREG_EXTRA_PROBLEM_LISTS) \ |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
887 |
$$(addprefix $$($1_TEST_ROOT)/, $$(JTREG_EXTRA_PROBLEM_LISTS)) \ |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
888 |
)) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
889 |
endif |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
890 |
|
51856
11b9d3a6f31c
8211037: Load jib jars dynamically from JibArtifactManager
erikj
parents:
50908
diff
changeset
|
891 |
ifneq ($$(JIB_HOME), ) |
11b9d3a6f31c
8211037: Load jib jars dynamically from JibArtifactManager
erikj
parents:
50908
diff
changeset
|
892 |
$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
|
893 |
endif |
e0ca0417b74d
8180600: make run-test does not work with jib test dependencies
erikj
parents:
45104
diff
changeset
|
894 |
|
55183
4929c53ff29d
8224778: test/jdk/demo/jfc/J2Ddemo/J2DdemoTest.java cannot find J2Ddemo.jar
prr
parents:
54516
diff
changeset
|
895 |
$1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_DIR=$(TEST_IMAGE_DIR) |
4929c53ff29d
8224778: test/jdk/demo/jfc/J2Ddemo/J2DdemoTest.java cannot find J2Ddemo.jar
prr
parents:
54516
diff
changeset
|
896 |
$1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_GRAAL_DIR=$(TEST_IMAGE_DIR)/hotspot/jtreg/graal |
50908 | 897 |
|
47986 | 898 |
ifneq ($$(JTREG_FAILURE_HANDLER_OPTIONS), ) |
899 |
$1_JTREG_LAUNCHER_OPTIONS += -Djava.library.path="$(JTREG_FAILURE_HANDLER_DIR)" |
|
900 |
endif |
|
901 |
||
52125
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
902 |
ifneq ($$(JTREG_KEYWORDS), ) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
903 |
# The keywords string may contain problematic characters and may be quoted |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
904 |
# already when it arrives here. Remove any existing quotes and replace them |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
905 |
# with one set of single quotes. |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
906 |
$1_JTREG_KEYWORDS := \ |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
907 |
$$(strip $$(subst $$(SQUOTE),,$$(subst $$(DQUOTE),,$$(JTREG_KEYWORDS)))) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
908 |
ifneq ($$($1_JTREG_KEYWORDS), ) |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
909 |
$1_JTREG_BASIC_OPTIONS += -k:'$$($1_JTREG_KEYWORDS)' |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
910 |
endif |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
911 |
endif |
28375a1de254
8212028: Use run-test makefile framework for testing in Oracle's Mach5
erikj
parents:
51856
diff
changeset
|
912 |
|
52393
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
913 |
ifneq ($$(JTREG_AOT_MODULES), ) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
914 |
$$(eval $$(call SetupAot, $1, \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
915 |
MODULES := $$(JTREG_AOT_MODULES), \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
916 |
VM_OPTIONS := $$(JTREG_VM_OPTIONS) $$(JTREG_JAVA_OPTIONS), \ |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
917 |
)) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
918 |
endif |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
919 |
|
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
920 |
ifneq ($$($1_AOT_OPTIONS), ) |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
921 |
$1_JTREG_BASIC_OPTIONS += -vmoptions:"$$($1_AOT_OPTIONS)" |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
922 |
endif |
ff10f8f3a583
8152988: [AOT] Update test batch definitions to include aot-ed java.base module mode into hs-comp testing
epavlova
parents:
52342
diff
changeset
|
923 |
|
47939
fe7596497fb0
8179555: make run-test should always use a fresh, clean JTwork directory
ihse
parents:
47938
diff
changeset
|
924 |
clean-workdir-$1: |
fe7596497fb0
8179555: make run-test should always use a fresh, clean JTwork directory
ihse
parents:
47938
diff
changeset
|
925 |
$$(RM) -r $$($1_TEST_SUPPORT_DIR) |
fe7596497fb0
8179555: make run-test should always use a fresh, clean JTwork directory
ihse
parents:
47938
diff
changeset
|
926 |
|
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
927 |
run-test-$1: pre-run-test clean-workdir-$1 $$($1_AOT_TARGETS) |
44027 | 928 |
$$(call LogWarn) |
929 |
$$(call LogWarn, Running test '$$($1_TEST)') |
|
930 |
$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
|
58754
f67f4674b466
8232834: RunTest sometimes fails to produce valid exitcode.txt
erikj
parents:
58075
diff
changeset
|
931 |
$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, ( \ |
53857 | 932 |
$$(COV_ENVIRONMENT) \ |
44027 | 933 |
$$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \ |
934 |
-Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \ |
|
935 |
$$($1_JTREG_BASIC_OPTIONS) \ |
|
53485 | 936 |
-testjdk:$$(JDK_UNDER_TEST) \ |
47937
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
937 |
-dir:$$(JTREG_TOPDIR) \ |
44027 | 938 |
-reportDir:$$($1_TEST_RESULTS_DIR) \ |
939 |
-workDir:$$($1_TEST_SUPPORT_DIR) \ |
|
940 |
$$(JTREG_OPTIONS) \ |
|
47986 | 941 |
$$(JTREG_FAILURE_HANDLER_OPTIONS) \ |
53857 | 942 |
$$(JTREG_COV_OPTIONS) \ |
48042 | 943 |
$$($1_TEST_NAME) \ |
944 |
&& $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
|
945 |
|| $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
|
58754
f67f4674b466
8232834: RunTest sometimes fails to produce valid exitcode.txt
erikj
parents:
58075
diff
changeset
|
946 |
)) |
44027 | 947 |
|
948 |
$1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt |
|
949 |
||
950 |
parse-test-$1: run-test-$1 |
|
951 |
$$(call LogWarn, Finished running test '$$($1_TEST)') |
|
952 |
$$(call LogWarn, Test report is stored in $$(strip \ |
|
953 |
$$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR)))) |
|
48042 | 954 |
$$(if $$(wildcard $$($1_RESULT_FILE)), \ |
47259
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
955 |
$$(eval $1_PASSED := $$(shell $$(AWK) '{ gsub(/[,;]/, ""); \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
956 |
for (i=1; i<=NF; i++) { if ($$$$i == "passed:") \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
957 |
print $$$$(i+1) } }' $$($1_RESULT_FILE))) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
958 |
$$(if $$($1_PASSED), , $$(eval $1_PASSED := 0)) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
959 |
$$(eval $1_FAILED := $$(shell $$(AWK) '{gsub(/[,;]/, ""); \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
960 |
for (i=1; i<=NF; i++) { if ($$$$i == "failed:") \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
961 |
print $$$$(i+1) } }' $$($1_RESULT_FILE))) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
962 |
$$(if $$($1_FAILED), , $$(eval $1_FAILED := 0)) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
963 |
$$(eval $1_ERROR := $$(shell $$(AWK) '{gsub(/[,;]/, ""); \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
964 |
for (i=1; i<=NF; i++) { if ($$$$i == "error:") \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
965 |
print $$$$(i+1) } }' $$($1_RESULT_FILE))) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
966 |
$$(if $$($1_ERROR), , $$(eval $1_ERROR := 0)) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
967 |
$$(eval $1_TOTAL := $$(shell \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
968 |
$$(EXPR) $$($1_PASSED) + $$($1_FAILED) + $$($1_ERROR))) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
969 |
, \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
970 |
$$(eval $1_PASSED := 0) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
971 |
$$(eval $1_FAILED := 0) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
972 |
$$(eval $1_ERROR := 1) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
973 |
$$(eval $1_TOTAL := 1) \ |
0b347d8efb40
8187672: RunTest displays broken output if jtreg fails completely
ihse
parents:
47253
diff
changeset
|
974 |
) |
44027 | 975 |
|
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
976 |
$1: run-test-$1 parse-test-$1 clean-workdir-$1 |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
977 |
|
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
978 |
TARGETS += $1 run-test-$1 parse-test-$1 clean-workdir-$1 |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
979 |
TEST_TARGETS += parse-test-$1 |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
980 |
|
44027 | 981 |
endef |
982 |
||
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
983 |
################################################################################ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
984 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
985 |
### Rules for special tests |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
986 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
987 |
SetupRunSpecialTest = $(NamedParamsMacroTemplate) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
988 |
define SetupRunSpecialTestBody |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
989 |
$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
|
990 |
$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
|
991 |
$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
|
992 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
993 |
$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
|
994 |
ifneq ($$(findstring :, $$($1_FULL_TEST_NAME)), ) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
995 |
$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
|
996 |
$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
|
997 |
else |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
998 |
$1_TEST_NAME := $$($1_FULL_TEST_NAME) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
999 |
$1_TEST_ARGS := |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1000 |
endif |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1001 |
|
52396
e292e94b448a
8213058: remove ExecuteInternalVMTests and VerboseInternalVMTests flags
iignatyev
parents:
52393
diff
changeset
|
1002 |
ifeq ($$($1_TEST_NAME), failure-handler) |
52342 | 1003 |
ifeq ($(BUILD_FAILURE_HANDLER), true) |
1004 |
$1_TEST_COMMAND_LINE := \ |
|
1005 |
($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f \ |
|
1006 |
BuildFailureHandler.gmk test) |
|
1007 |
else |
|
1008 |
$$(error Cannot test failure handler if it is not built) |
|
1009 |
endif |
|
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1010 |
else ifeq ($$($1_TEST_NAME), make) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1011 |
$1_TEST_COMMAND_LINE := \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1012 |
($(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
|
1013 |
TestMake.gmk $$($1_TEST_ARGS)) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1014 |
else |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1015 |
$$(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
|
1016 |
endif |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1017 |
|
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1018 |
run-test-$1: pre-run-test |
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1019 |
$$(call LogWarn) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1020 |
$$(call LogWarn, Running test '$$($1_TEST)') |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1021 |
$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
58754
f67f4674b466
8232834: RunTest sometimes fails to produce valid exitcode.txt
erikj
parents:
58075
diff
changeset
|
1022 |
$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, ( \ |
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1023 |
$$($1_TEST_COMMAND_LINE) \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1024 |
> >($(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
|
1025 |
&& $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1026 |
|| $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
58754
f67f4674b466
8232834: RunTest sometimes fails to produce valid exitcode.txt
erikj
parents:
58075
diff
changeset
|
1027 |
)) |
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1028 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1029 |
$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
|
1030 |
|
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1031 |
# 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
|
1032 |
parse-test-$1: run-test-$1 |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1033 |
$$(call LogWarn, Finished running test '$$($1_TEST)') |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1034 |
$$(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
|
1035 |
$$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR)))) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1036 |
$$(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
|
1037 |
$$(eval $1_PASSED := 0) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1038 |
$$(eval $1_FAILED := 0) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1039 |
$$(eval $1_ERROR := 0) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1040 |
$$(eval $1_TOTAL := 0) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1041 |
|
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1042 |
$1: run-test-$1 parse-test-$1 |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1043 |
|
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1044 |
TARGETS += $1 run-test-$1 parse-test-$1 |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1045 |
TEST_TARGETS += parse-test-$1 |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1046 |
|
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1047 |
endef |
44027 | 1048 |
|
1049 |
################################################################################ |
|
1050 |
# Setup and execute make rules for all selected tests |
|
1051 |
################################################################################ |
|
1052 |
||
1053 |
# Helper function to determine which handler to use for the given test |
|
1054 |
UseGtestTestHandler = \ |
|
1055 |
$(if $(filter gtest:%, $1), true) |
|
1056 |
||
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
1057 |
UseMicroTestHandler = \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
1058 |
$(if $(filter micro:%, $1), true) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
1059 |
|
44027 | 1060 |
UseJtregTestHandler = \ |
1061 |
$(if $(filter jtreg:%, $1), true) |
|
1062 |
||
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1063 |
UseSpecialTestHandler = \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1064 |
$(if $(filter special:%, $1), true) |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1065 |
|
44027 | 1066 |
# Now process each test to run and setup a proper make rule |
1067 |
$(foreach test, $(TESTS_TO_RUN), \ |
|
1068 |
$(eval TEST_ID := $(shell $(ECHO) $(strip $(test)) | \ |
|
48042 | 1069 |
$(TR) -cs '[a-z][A-Z][0-9]\n' '[_*1000]')) \ |
44027 | 1070 |
$(eval ALL_TEST_IDS += $(TEST_ID)) \ |
1071 |
$(if $(call UseCustomTestHandler, $(test)), \ |
|
1072 |
$(eval $(call SetupRunCustomTest, $(TEST_ID), \ |
|
1073 |
TEST := $(test), \ |
|
1074 |
)) \ |
|
1075 |
) \ |
|
1076 |
$(if $(call UseGtestTestHandler, $(test)), \ |
|
1077 |
$(eval $(call SetupRunGtestTest, $(TEST_ID), \ |
|
1078 |
TEST := $(test), \ |
|
1079 |
)) \ |
|
1080 |
) \ |
|
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
1081 |
$(if $(call UseMicroTestHandler, $(test)), \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
1082 |
$(eval $(call SetupRunMicroTest, $(TEST_ID), \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
1083 |
TEST := $(test), \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
1084 |
)) \ |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52593
diff
changeset
|
1085 |
) \ |
44027 | 1086 |
$(if $(call UseJtregTestHandler, $(test)), \ |
1087 |
$(eval $(call SetupRunJtregTest, $(TEST_ID), \ |
|
1088 |
TEST := $(test), \ |
|
1089 |
)) \ |
|
1090 |
) \ |
|
48061
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1091 |
$(if $(call UseSpecialTestHandler, $(test)), \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1092 |
$(eval $(call SetupRunSpecialTest, $(TEST_ID), \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1093 |
TEST := $(test), \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1094 |
)) \ |
665769d3cee4
8193014: Add "special" tests to run-test to cover odd cases
ihse
parents:
48058
diff
changeset
|
1095 |
) \ |
44027 | 1096 |
) |
1097 |
||
1098 |
# Sort also removes duplicates, so if there is any we'll get fewer words. |
|
1099 |
ifneq ($(words $(ALL_TEST_IDS)), $(words $(sort $(ALL_TEST_IDS)))) |
|
1100 |
$(error Duplicate test specification) |
|
1101 |
endif |
|
1102 |
||
1103 |
||
1104 |
################################################################################ |
|
1105 |
# The main target for RunTests.gmk |
|
1106 |
################################################################################ |
|
1107 |
||
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1108 |
# |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1109 |
# Provide hooks for adding functionality before and after all tests are run. |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1110 |
# |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1111 |
|
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1112 |
$(call LogInfo, RunTest setup starting) |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1113 |
|
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1114 |
# This target depends on all actual test having been run (TEST_TARGETS has beeen |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1115 |
# populated by the SetupRun*Test functions). If you need to provide a teardown |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1116 |
# hook, you must let it depend on this target. |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1117 |
run-all-tests: $(TEST_TARGETS) |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1118 |
$(call LogInfo, RunTest teardown starting) |
44027 | 1119 |
|
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1120 |
# This is an abstract target that will be run before any actual tests. Add your |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1121 |
# target as a dependency to thisif you need "setup" type functionality executed |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1122 |
# before all tests. |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1123 |
pre-run-test: |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1124 |
$(call LogInfo, RunTest setup done) |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1125 |
|
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1126 |
# This is an abstract target that will be run after all actual tests, but before |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1127 |
# the test summary. If you need "teardown" type functionality, add your target |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1128 |
# as a dependency on this, and let the teardown target depend on run-all-tests. |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1129 |
post-run-test: run-all-tests |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1130 |
$(call LogInfo, RunTest teardown done) |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1131 |
|
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1132 |
# |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1133 |
# Create and print a table of the result of all tests run |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1134 |
# |
44027 | 1135 |
TEST_FAILURE := false |
1136 |
||
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1137 |
run-test-report: post-run-test |
47943 | 1138 |
$(RM) $(TEST_SUMMARY).old 2> /dev/null |
1139 |
$(MV) $(TEST_SUMMARY) $(TEST_SUMMARY).old 2> /dev/null || true |
|
48042 | 1140 |
$(RM) $(TEST_LAST_IDS).old 2> /dev/null |
1141 |
$(MV) $(TEST_LAST_IDS) $(TEST_LAST_IDS).old 2> /dev/null || true |
|
47943 | 1142 |
$(ECHO) >> $(TEST_SUMMARY) ============================== |
1143 |
$(ECHO) >> $(TEST_SUMMARY) Test summary |
|
1144 |
$(ECHO) >> $(TEST_SUMMARY) ============================== |
|
1145 |
$(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5s %5s %5s %5s %2s\n" " " \ |
|
1146 |
TEST TOTAL PASS FAIL ERROR " " |
|
44027 | 1147 |
$(foreach test, $(TESTS_TO_RUN), \ |
1148 |
$(eval TEST_ID := $(shell $(ECHO) $(strip $(test)) | \ |
|
48042 | 1149 |
$(TR) -cs '[a-z][A-Z][0-9]\n' '[_*1000]')) \ |
1150 |
$(ECHO) >> $(TEST_LAST_IDS) $(TEST_ID) $(NEWLINE) \ |
|
1151 |
$(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
|
1152 |
$(if $(filter __________________________________________________%, $(NAME_PATTERN)), \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
1153 |
$(eval TEST_NAME := ) \ |
47943 | 1154 |
$(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
|
1155 |
, \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
1156 |
$(eval TEST_NAME := $(test)) \ |
c1437939b0d8
8177957: run-test summary lines look bad/misleading with long test names
ihse
parents:
47932
diff
changeset
|
1157 |
) \ |
44027 | 1158 |
$(if $(filter $($(TEST_ID)_PASSED), $($(TEST_ID)_TOTAL)), \ |
47943 | 1159 |
$(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5d %5d %5d %5d %2s\n" \ |
1160 |
" " "$(TEST_NAME)" $($(TEST_ID)_TOTAL) $($(TEST_ID)_PASSED) \ |
|
1161 |
$($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR) " " $(NEWLINE) \ |
|
44027 | 1162 |
, \ |
47943 | 1163 |
$(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5d %5d %5d %5d %2s\n" \ |
1164 |
">>" "$(TEST_NAME)" $($(TEST_ID)_TOTAL) $($(TEST_ID)_PASSED) \ |
|
1165 |
$($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR) "<<" $(NEWLINE) \ |
|
44027 | 1166 |
$(eval TEST_FAILURE := true) \ |
1167 |
) \ |
|
1168 |
) |
|
47943 | 1169 |
$(ECHO) >> $(TEST_SUMMARY) ============================== |
44027 | 1170 |
$(if $(filter true, $(TEST_FAILURE)), \ |
47943 | 1171 |
$(ECHO) >> $(TEST_SUMMARY) TEST FAILURE $(NEWLINE) \ |
1172 |
$(MKDIR) -p $(MAKESUPPORT_OUTPUTDIR) $(NEWLINE) \ |
|
44027 | 1173 |
$(TOUCH) $(MAKESUPPORT_OUTPUTDIR)/exit-with-error \ |
1174 |
, \ |
|
47943 | 1175 |
$(ECHO) >> $(TEST_SUMMARY) TEST SUCCESS \ |
44027 | 1176 |
) |
1177 |
$(ECHO) |
|
47943 | 1178 |
$(CAT) $(TEST_SUMMARY) |
1179 |
$(ECHO) |
|
44027 | 1180 |
|
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1181 |
# The main run-test target |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1182 |
run-test: run-test-report |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1183 |
|
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1184 |
TARGETS += run-all-tests pre-run-test post-run-test run-test-report run-test |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1185 |
|
44027 | 1186 |
################################################################################ |
53295
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1187 |
# Setup JCov |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1188 |
################################################################################ |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1189 |
|
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1190 |
ifeq ($(TEST_OPTS_JCOV), true) |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1191 |
|
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1192 |
jcov-do-start-grabber: |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1193 |
$(call MakeDir, $(JCOV_OUTPUT_DIR)) |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1194 |
if $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -status 1>/dev/null 2>&1 ; then \ |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1195 |
$(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600 ; \ |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1196 |
fi |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1197 |
$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \ |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1198 |
$(JCOV_IMAGE_DIR)/template.xml -o $(JCOV_RESULT_FILE) \ |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1199 |
1>$(JCOV_GRABBER_LOG) 2>&1 & |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1200 |
|
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1201 |
jcov-start-grabber: jcov-do-start-grabber |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1202 |
$(call LogWarn, Starting JCov Grabber...) |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1203 |
$(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -t 600 -wait |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1204 |
|
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1205 |
jcov-stop-grabber: |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1206 |
$(call LogWarn, Stopping JCov Grabber...) |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1207 |
$(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600 |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1208 |
|
54516
5b1ad4cbe59e
8221857: Collect code coverage for a subset of code
shurailine
parents:
53857
diff
changeset
|
1209 |
JCOV_REPORT_TITLE := JDK code coverage report<br/> |
5b1ad4cbe59e
8221857: Collect code coverage for a subset of code
shurailine
parents:
53857
diff
changeset
|
1210 |
ifneq ($(JCOV_FILTERS), ) |
5b1ad4cbe59e
8221857: Collect code coverage for a subset of code
shurailine
parents:
53857
diff
changeset
|
1211 |
JCOV_REPORT_TITLE += Code filters: $(JCOV_FILTERS)<br> |
5b1ad4cbe59e
8221857: Collect code coverage for a subset of code
shurailine
parents:
53857
diff
changeset
|
1212 |
endif |
5b1ad4cbe59e
8221857: Collect code coverage for a subset of code
shurailine
parents:
53857
diff
changeset
|
1213 |
JCOV_REPORT_TITLE += Tests: $(TEST) |
55098
609dc5c60c06
8224011: Failure handling in ExecuteWithLog fails in run-test-prebuilt
erikj
parents:
54516
diff
changeset
|
1214 |
|
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1215 |
jcov-gen-report: jcov-stop-grabber |
53295
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1216 |
$(call LogWarn, Generating JCov report ...) |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1217 |
$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \ |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1218 |
`$(ECHO) $(TOPDIR)/src/*/share/classes/ | $(TR) ' ' ':'` -fmt html \ |
54516
5b1ad4cbe59e
8221857: Collect code coverage for a subset of code
shurailine
parents:
53857
diff
changeset
|
1219 |
$(JCOV_FILTERS) \ |
5b1ad4cbe59e
8221857: Collect code coverage for a subset of code
shurailine
parents:
53857
diff
changeset
|
1220 |
-mainReportTitle "$(JCOV_REPORT_TITLE)" \ |
53295
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1221 |
-o $(JCOV_REPORT) $(JCOV_RESULT_FILE) |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1222 |
|
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1223 |
TARGETS += jcov-do-start-grabber jcov-start-grabber jcov-stop-grabber \ |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1224 |
jcov-gen-report |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1225 |
|
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1226 |
# Hook this into the framework at appropriate places |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1227 |
pre-run-test: jcov-start-grabber |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1228 |
|
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1229 |
post-run-test: jcov-gen-report |
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1230 |
|
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1231 |
jcov-gen-report: run-all-tests |
53295
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1232 |
|
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1233 |
endif |
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1234 |
|
520f8e2041bb
8215729: Enhance makefiles to allow collecting code coverage with JCov
shurailine
parents:
52790
diff
changeset
|
1235 |
################################################################################ |
44027 | 1236 |
|
1237 |
all: run-test |
|
1238 |
||
53465
d982794784f1
8217626: Add setup/teardown functionality to RunTest
ihse
parents:
53464
diff
changeset
|
1239 |
.PHONY: default all $(TARGETS) |