author | hseigel |
Wed, 01 Mar 2017 08:00:02 -0500 | |
changeset 46194 | 5596e6f63072 |
parent 43386 | df350c85390b |
child 47218 | 918745561887 |
permissions | -rw-r--r-- |
4947 | 1 |
# |
34594
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
2 |
# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. |
4947 | 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 |
|
5499 | 7 |
# published by the Free Software Foundation. Oracle designates this |
4947 | 8 |
# particular file as subject to the "Classpath" exception as provided |
5499 | 9 |
# by Oracle in the LICENSE file that accompanied this code. |
4947 | 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 |
# |
|
5499 | 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. |
|
4947 | 24 |
# |
25 |
||
26 |
# |
|
27 |
# Makefile to run tests from multiple sibling directories |
|
28 |
# |
|
29 |
||
30 |
# Root of the forest that was built |
|
31 |
TOPDIR=.. |
|
32 |
||
33 |
# This makefile depends on the availability of sibling directories. |
|
34 |
LANGTOOLS_DIR=$(TOPDIR)/langtools |
|
35 |
JDK_DIR=$(TOPDIR)/jdk |
|
28006
ebad70f3aa9f
8065673: XML Test Colo: Add test build system for JAXP tests
joehw
parents:
25461
diff
changeset
|
36 |
JAXP_DIR=$(TOPDIR)/jaxp |
24419
b06dcd11db3f
8042804: Support invoking Hotspot tests from top level
mikael
parents:
21760
diff
changeset
|
37 |
HOTSPOT_DIR=$(TOPDIR)/hotspot |
4947 | 38 |
|
39 |
# Macro to run a test target in a subdir |
|
40 |
define SUBDIR_TEST # subdirectory target |
|
41 |
if [ -d $1 ] ; then \ |
|
42 |
if [ -r $1/test/Makefile ] ; then \ |
|
35745 | 43 |
$(MAKE) --no-print-directory -k -C $1/test $2 ; \ |
4947 | 44 |
else \ |
45 |
echo "ERROR: File does not exist: $1/test/Makefile"; \ |
|
5115
204e24e427b0
6936788: Minor adjustment to top repo test/Makefile, missing non-zero exit case
ohair
parents:
5112
diff
changeset
|
46 |
exit 1; \ |
4947 | 47 |
fi; \ |
48 |
else \ |
|
49 |
echo "WARNING: No testing done, directory does not exist: $1"; \ |
|
50 |
fi |
|
51 |
endef |
|
52 |
||
15577
0ed5f9a7f454
8006595: Use jdk/test/Makefile targets in preference to local definitions
mduigou
parents:
15173
diff
changeset
|
53 |
# Default test target (core) |
28006
ebad70f3aa9f
8065673: XML Test Colo: Add test build system for JAXP tests
joehw
parents:
25461
diff
changeset
|
54 |
default: jdk_core langtools_jtreg jaxp_all |
11242 | 55 |
|
56 |
# All testing |
|
28006
ebad70f3aa9f
8065673: XML Test Colo: Add test build system for JAXP tests
joehw
parents:
25461
diff
changeset
|
57 |
all: jdk_all langtools_all jaxp_all |
4947 | 58 |
|
32565
77ad9375337e
8130929: Enable deployment tests in build system
ddehaven
parents:
28006
diff
changeset
|
59 |
# Bring in closed test targets if present |
77ad9375337e
8130929: Enable deployment tests in build system
ddehaven
parents:
28006
diff
changeset
|
60 |
-include $(TOPDIR)/closed/test/Makefile |
77ad9375337e
8130929: Enable deployment tests in build system
ddehaven
parents:
28006
diff
changeset
|
61 |
|
34594
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
62 |
ifeq ($(TEST_JOBS), 0) |
43386 | 63 |
ifeq ($(shell $(EXPR) $(JOBS) \> 50), 1) |
64 |
# JTReg cannot handle more than 50 in concurrency |
|
65 |
JDK_TEST_JOBS=50 |
|
66 |
else |
|
67 |
JDK_TEST_JOBS=$(JOBS) |
|
68 |
endif |
|
34594
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
69 |
else |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
70 |
JDK_TEST_JOBS=$(TEST_JOBS) |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
71 |
endif |
4947 | 72 |
# Test targets |
19520
527f461b65a3
8023491: Remove target names from test/Makefile and defer to sub-repo makefiles.
mduigou
parents:
15577
diff
changeset
|
73 |
langtools_% : |
34594
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
74 |
@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), CONCURRENCY=$(JDK_TEST_JOBS) JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) |
15577
0ed5f9a7f454
8006595: Use jdk/test/Makefile targets in preference to local definitions
mduigou
parents:
15173
diff
changeset
|
75 |
|
21760
9f542d8601a8
8028478: Re-visit JPRT testsets to make it easier to run subsets of the tests
alanb
parents:
19522
diff
changeset
|
76 |
jdk_% core_%s svc_%: |
34594
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
77 |
@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), CONCURRENCY=$(JDK_TEST_JOBS) TEST="$@" $@) |
4947 | 78 |
|
28006
ebad70f3aa9f
8065673: XML Test Colo: Add test build system for JAXP tests
joehw
parents:
25461
diff
changeset
|
79 |
jaxp_%: |
34594
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
80 |
@$(NO_STOPPING)$(call SUBDIR_TEST, $(JAXP_DIR), CONCURRENCY=$(JDK_TEST_JOBS) TEST="$@" $@) |
28006
ebad70f3aa9f
8065673: XML Test Colo: Add test build system for JAXP tests
joehw
parents:
25461
diff
changeset
|
81 |
|
41648
12f2a158f88b
8166738: Enable concurrency in Hotspot jtreg testing
ctornqvi
parents:
37863
diff
changeset
|
82 |
SUB_MAKE_ARGS := |
12f2a158f88b
8166738: Enable concurrency in Hotspot jtreg testing
ctornqvi
parents:
37863
diff
changeset
|
83 |
ifneq ($(TEST_JOBS), 0) |
12f2a158f88b
8166738: Enable concurrency in Hotspot jtreg testing
ctornqvi
parents:
37863
diff
changeset
|
84 |
ifneq ($(TEST_JOBS), ) |
12f2a158f88b
8166738: Enable concurrency in Hotspot jtreg testing
ctornqvi
parents:
37863
diff
changeset
|
85 |
SUB_MAKE_ARGS += CONCURRENCY=$(TEST_JOBS) |
12f2a158f88b
8166738: Enable concurrency in Hotspot jtreg testing
ctornqvi
parents:
37863
diff
changeset
|
86 |
endif |
34594
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
87 |
endif |
24419
b06dcd11db3f
8042804: Support invoking Hotspot tests from top level
mikael
parents:
21760
diff
changeset
|
88 |
hotspot_%: |
41648
12f2a158f88b
8166738: Enable concurrency in Hotspot jtreg testing
ctornqvi
parents:
37863
diff
changeset
|
89 |
@$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), $(SUB_MAKE_ARGS) TEST="$@" $@) |
24419
b06dcd11db3f
8042804: Support invoking Hotspot tests from top level
mikael
parents:
21760
diff
changeset
|
90 |
|
25461
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
91 |
# |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
92 |
# jtreg_tests |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
93 |
# |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
94 |
# Invocation: |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
95 |
# |
37863 | 96 |
# make jtreg_tests TESTDIRS=<test-dirs> TEST_SELECTION=<path to test or jtreg group> TEST_OUTPUT_DIR=<path> |
25461
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
97 |
# |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
98 |
# where <test-dirs> is something like '../<component>/test/runtime', |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
99 |
# <component> in turn being one of the top level directories (for |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
100 |
# example 'hotspot'). |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
101 |
# |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
102 |
# The below will strip the path prefix and delegate to the |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
103 |
# corresponding ../<component>/test/Makefile. |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
104 |
|
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
105 |
ifneq ($(TESTDIRS),) |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
106 |
# Extract the component from ../<component>/... |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
107 |
COMPONENT=$(word 2,$(subst /, ,$(TESTDIRS))) |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
108 |
|
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
109 |
# Strip off the ../<component>/test prefix and pass the rest as TESTDIRS |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
110 |
# to the delegate Makefile |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
111 |
TESTDIRS_TESTS=$(patsubst ../$(COMPONENT)/test/%,%,$(TESTDIRS)) |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
112 |
endif |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
113 |
|
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
114 |
jtreg_tests: |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
115 |
@$(NO_STOPPING)$(call SUBDIR_TEST, $(TOPDIR)/$(COMPONENT), TESTDIRS=$(TESTDIRS_TESTS) $@) |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
116 |
|
4947 | 117 |
################################################################ |
118 |
||
119 |
# Phony targets (e.g. these are not filenames) |
|
19520
527f461b65a3
8023491: Remove target names from test/Makefile and defer to sub-repo makefiles.
mduigou
parents:
15577
diff
changeset
|
120 |
.PHONY: all clean |
4947 | 121 |
|
122 |
################################################################ |