author | ihse |
Thu, 01 Mar 2018 01:24:12 +0100 | |
branch | ihse-cflags-rewrite-branch |
changeset 56231 | 66bf73fcdf4d |
parent 47938 | a182ac1491d7 |
child 52342 | 9341b077bd55 |
child 55894 | 6da4c12646f3 |
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 |
# Macro to run a test target in a subdir |
|
31 |
define SUBDIR_TEST # subdirectory target |
|
32 |
if [ -d $1 ] ; then \ |
|
47218 | 33 |
if [ -r $1/Makefile ] ; then \ |
34 |
$(MAKE) --no-print-directory -k -C $1 $2 ; \ |
|
4947 | 35 |
else \ |
47218 | 36 |
echo "ERROR: File does not exist: $1/Makefile"; \ |
5115
204e24e427b0
6936788: Minor adjustment to top repo test/Makefile, missing non-zero exit case
ohair
parents:
5112
diff
changeset
|
37 |
exit 1; \ |
4947 | 38 |
fi; \ |
39 |
else \ |
|
40 |
echo "WARNING: No testing done, directory does not exist: $1"; \ |
|
41 |
fi |
|
42 |
endef |
|
43 |
||
15577
0ed5f9a7f454
8006595: Use jdk/test/Makefile targets in preference to local definitions
mduigou
parents:
15173
diff
changeset
|
44 |
# Default test target (core) |
28006
ebad70f3aa9f
8065673: XML Test Colo: Add test build system for JAXP tests
joehw
parents:
25461
diff
changeset
|
45 |
default: jdk_core langtools_jtreg jaxp_all |
11242 | 46 |
|
47 |
# All testing |
|
28006
ebad70f3aa9f
8065673: XML Test Colo: Add test build system for JAXP tests
joehw
parents:
25461
diff
changeset
|
48 |
all: jdk_all langtools_all jaxp_all |
4947 | 49 |
|
34594
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
50 |
ifeq ($(TEST_JOBS), 0) |
47938 | 51 |
JDK_TEST_JOBS=$(JOBS) |
34594
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
52 |
else |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
53 |
JDK_TEST_JOBS=$(TEST_JOBS) |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
54 |
endif |
4947 | 55 |
# Test targets |
19520
527f461b65a3
8023491: Remove target names from test/Makefile and defer to sub-repo makefiles.
mduigou
parents:
15577
diff
changeset
|
56 |
langtools_% : |
47221
3b201865d5c1
8187642: The consolidated repo test makefile disables CONCURRENCY setting to jtreg
erikj
parents:
47218
diff
changeset
|
57 |
@$(NO_STOPPING)$(call SUBDIR_TEST, langtools, \ |
3b201865d5c1
8187642: The consolidated repo test makefile disables CONCURRENCY setting to jtreg
erikj
parents:
47218
diff
changeset
|
58 |
$(if $(JDK_TEST_JOBS), CONCURRENCY=$(JDK_TEST_JOBS)) \ |
47218 | 59 |
JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) \ |
60 |
TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) |
|
15577
0ed5f9a7f454
8006595: Use jdk/test/Makefile targets in preference to local definitions
mduigou
parents:
15173
diff
changeset
|
61 |
|
21760
9f542d8601a8
8028478: Re-visit JPRT testsets to make it easier to run subsets of the tests
alanb
parents:
19522
diff
changeset
|
62 |
jdk_% core_%s svc_%: |
47221
3b201865d5c1
8187642: The consolidated repo test makefile disables CONCURRENCY setting to jtreg
erikj
parents:
47218
diff
changeset
|
63 |
@$(NO_STOPPING)$(call SUBDIR_TEST, jdk, \ |
3b201865d5c1
8187642: The consolidated repo test makefile disables CONCURRENCY setting to jtreg
erikj
parents:
47218
diff
changeset
|
64 |
$(if $(JDK_TEST_JOBS), CONCURRENCY=$(JDK_TEST_JOBS)) TEST="$@" $@) |
4947 | 65 |
|
28006
ebad70f3aa9f
8065673: XML Test Colo: Add test build system for JAXP tests
joehw
parents:
25461
diff
changeset
|
66 |
jaxp_%: |
47221
3b201865d5c1
8187642: The consolidated repo test makefile disables CONCURRENCY setting to jtreg
erikj
parents:
47218
diff
changeset
|
67 |
@$(NO_STOPPING)$(call SUBDIR_TEST, jaxp, \ |
3b201865d5c1
8187642: The consolidated repo test makefile disables CONCURRENCY setting to jtreg
erikj
parents:
47218
diff
changeset
|
68 |
$(if $(JDK_TEST_JOBS), CONCURRENCY=$(JDK_TEST_JOBS)) TEST="$@" $@) |
47218 | 69 |
|
70 |
nashorn_%: |
|
47221
3b201865d5c1
8187642: The consolidated repo test makefile disables CONCURRENCY setting to jtreg
erikj
parents:
47218
diff
changeset
|
71 |
@$(NO_STOPPING)$(call SUBDIR_TEST, nashorn, \ |
3b201865d5c1
8187642: The consolidated repo test makefile disables CONCURRENCY setting to jtreg
erikj
parents:
47218
diff
changeset
|
72 |
$(if $(JDK_TEST_JOBS), CONCURRENCY=$(JDK_TEST_JOBS)) TEST="$@" $@) |
28006
ebad70f3aa9f
8065673: XML Test Colo: Add test build system for JAXP tests
joehw
parents:
25461
diff
changeset
|
73 |
|
41648
12f2a158f88b
8166738: Enable concurrency in Hotspot jtreg testing
ctornqvi
parents:
37863
diff
changeset
|
74 |
SUB_MAKE_ARGS := |
12f2a158f88b
8166738: Enable concurrency in Hotspot jtreg testing
ctornqvi
parents:
37863
diff
changeset
|
75 |
ifneq ($(TEST_JOBS), 0) |
12f2a158f88b
8166738: Enable concurrency in Hotspot jtreg testing
ctornqvi
parents:
37863
diff
changeset
|
76 |
ifneq ($(TEST_JOBS), ) |
12f2a158f88b
8166738: Enable concurrency in Hotspot jtreg testing
ctornqvi
parents:
37863
diff
changeset
|
77 |
SUB_MAKE_ARGS += CONCURRENCY=$(TEST_JOBS) |
12f2a158f88b
8166738: Enable concurrency in Hotspot jtreg testing
ctornqvi
parents:
37863
diff
changeset
|
78 |
endif |
34594
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
32565
diff
changeset
|
79 |
endif |
24419
b06dcd11db3f
8042804: Support invoking Hotspot tests from top level
mikael
parents:
21760
diff
changeset
|
80 |
hotspot_%: |
47218 | 81 |
@$(NO_STOPPING)$(call SUBDIR_TEST, hotspot/jtreg, $(SUB_MAKE_ARGS) TEST="$@" $@) |
24419
b06dcd11db3f
8042804: Support invoking Hotspot tests from top level
mikael
parents:
21760
diff
changeset
|
82 |
|
25461
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
83 |
# |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
84 |
# jtreg_tests |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
85 |
# |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
86 |
# Invocation: |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
87 |
# |
37863 | 88 |
# 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
|
89 |
# |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
90 |
# 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
|
91 |
# <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
|
92 |
# example 'hotspot'). |
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 |
# 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
|
95 |
# corresponding ../<component>/test/Makefile. |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
96 |
|
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
97 |
ifneq ($(TESTDIRS),) |
47218 | 98 |
# Extract the component from ../test/<component>/... |
99 |
TESTDIRS_NORM := $(patsubst test/%, %, $(patsubst ../%, %, $(TESTDIRS))) |
|
100 |
COMPONENT := $(word 1,$(subst /, ,$(TESTDIRS_NORM))) |
|
25461
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
101 |
|
47218 | 102 |
# Strip off the ../<component>/test prefix and pass the rest as TESTDIRS |
103 |
# to the delegate Makefile |
|
104 |
# The hotspot tests are in a subdir "java". Accept paths both including |
|
105 |
# and excluding this extra subdir |
|
106 |
TESTDIRS_TESTS := $(patsubst $(COMPONENT)/%,%,$(patsubst hotspot/jtreg/%,%, \ |
|
107 |
$(patsubst ../%, %, $(TESTDIRS_NORM)))) |
|
25461
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
108 |
endif |
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
109 |
|
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
110 |
jtreg_tests: |
47218 | 111 |
$(MAKE) --no-print-directory TESTDIRS=$(TESTDIRS_TESTS) \ |
112 |
$(COMPONENT)_jtreg_tests |
|
25461
2842cbf0da97
8050825: Support running regression tests using jtreg_tests+TESTDIRS from top level
mikael
parents:
24419
diff
changeset
|
113 |
|
4947 | 114 |
################################################################ |
115 |
||
116 |
# 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
|
117 |
.PHONY: all clean |
4947 | 118 |
|
119 |
################################################################ |