author | amurillo |
Wed, 15 Aug 2012 16:49:38 -0700 | |
changeset 13465 | d3fc5d192448 |
parent 12887 | 582f5a8047e9 |
child 13569 | a6a02227e47f |
permissions | -rw-r--r-- |
2 | 1 |
# |
11686
398118274810
7136538: typo in test/Makefile under the jdk_security3 target
valeriep
parents:
11523
diff
changeset
|
2 |
# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
4 |
# |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
5506 | 7 |
# published by the Free Software Foundation. Oracle designates this |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
5506 | 9 |
# by Oracle in the LICENSE file that accompanied this code. |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
10 |
# |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
15 |
# accompanied this code). |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
16 |
# |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
20 |
# |
5506 | 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. |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
24 |
# |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
25 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
26 |
# |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
27 |
# Makefile to run various jdk tests |
2 | 28 |
# |
29 |
||
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
30 |
# Empty these to get rid of some default rules |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
31 |
.SUFFIXES: |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
32 |
.SUFFIXES: .java |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
33 |
CO= |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
34 |
GET= |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
35 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
36 |
# Utilities used |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
37 |
AWK = awk |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
38 |
CAT = cat |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
39 |
CD = cd |
5600
8ca34998a6b3
6943915: Adjust jdk/test/Makefile to deal with .dll and .so libraries needing execute permissions
ohair
parents:
5149
diff
changeset
|
40 |
CHMOD = chmod |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
41 |
CP = cp |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
42 |
CUT = cut |
5600
8ca34998a6b3
6943915: Adjust jdk/test/Makefile to deal with .dll and .so libraries needing execute permissions
ohair
parents:
5149
diff
changeset
|
43 |
DIRNAME = dirname |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
44 |
ECHO = echo |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
45 |
EGREP = egrep |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
46 |
EXPAND = expand |
5600
8ca34998a6b3
6943915: Adjust jdk/test/Makefile to deal with .dll and .so libraries needing execute permissions
ohair
parents:
5149
diff
changeset
|
47 |
FIND = find |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
48 |
MKDIR = mkdir |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
49 |
PWD = pwd |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
50 |
SED = sed |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
51 |
SORT = sort |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
52 |
TEE = tee |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
53 |
UNAME = uname |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
54 |
UNIQ = uniq |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
55 |
WC = wc |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
56 |
ZIP = zip |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
57 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
58 |
# Get OS name from uname |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
59 |
UNAME_S := $(shell $(UNAME) -s) |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
60 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
61 |
# Commands to run on paths to make mixed paths for java on windows |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
62 |
GETMIXEDPATH=$(ECHO) |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
63 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
64 |
# Location of developer shared files |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
65 |
SLASH_JAVA = /java |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
66 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
67 |
# Platform specific settings |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
68 |
ifeq ($(UNAME_S), SunOS) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
69 |
OS_NAME = solaris |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
70 |
OS_ARCH := $(shell $(UNAME) -p) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
71 |
OS_VERSION := $(shell $(UNAME) -r) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
72 |
endif |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
73 |
ifeq ($(UNAME_S), Linux) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
74 |
OS_NAME = linux |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
75 |
OS_ARCH := $(shell $(UNAME) -m) |
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
76 |
# Check for unknown arch, try uname -p if uname -m says unknown |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
77 |
ifeq ($(OS_ARCH),unknown) |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
78 |
OS_ARCH := $(shell $(UNAME) -p) |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
79 |
endif |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
80 |
OS_VERSION := $(shell $(UNAME) -r) |
2 | 81 |
endif |
12047
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
11910
diff
changeset
|
82 |
ifeq ($(UNAME_S), Darwin) |
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
11910
diff
changeset
|
83 |
OS_NAME = macosx |
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
11910
diff
changeset
|
84 |
OS_ARCH := $(shell $(UNAME) -m) |
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
11910
diff
changeset
|
85 |
# Check for unknown arch, try uname -p if uname -m says unknown |
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
11910
diff
changeset
|
86 |
ifeq ($(OS_ARCH),unknown) |
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
11910
diff
changeset
|
87 |
OS_ARCH := $(shell $(UNAME) -p) |
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
11910
diff
changeset
|
88 |
endif |
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
11910
diff
changeset
|
89 |
OS_VERSION := $(shell $(UNAME) -r) |
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
11910
diff
changeset
|
90 |
endif |
5611
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
91 |
ifeq ($(OS_NAME),) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
92 |
OS_NAME = windows |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
93 |
# GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
94 |
# return "x86". Use the first word of $(PROCESSOR_IDENTIFIER) instead. |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
95 |
ifeq ($(PROCESSOR_IDENTIFIER),) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
96 |
PROC_ARCH:=$(shell $(UNAME) -m) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
97 |
else |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
98 |
PROC_ARCH:=$(word 1, $(PROCESSOR_IDENTIFIER)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
99 |
endif |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
100 |
OS_ARCH:=$(PROC_ARCH) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
101 |
SLASH_JAVA = J: |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
102 |
EXESUFFIX = .exe |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
103 |
# These need to be different depending on MKS or CYGWIN |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
104 |
ifeq ($(findstring cygdrive,$(shell ($(CD) C:/ && $(PWD)))), ) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
105 |
GETMIXEDPATH = dosname -s |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
106 |
OS_VERSION := $(shell $(UNAME) -r) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
107 |
else |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
108 |
GETMIXEDPATH = cygpath -m -s |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
109 |
OS_VERSION := $(shell $(UNAME) -s | $(CUT) -d'-' -f2) |
2 | 110 |
endif |
111 |
endif |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
112 |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
113 |
# Only want major and minor numbers from os version |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
114 |
OS_VERSION := $(shell $(ECHO) "$(OS_VERSION)" | $(CUT) -d'.' -f1,2) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
115 |
|
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
116 |
# Name to use for x86_64 arch (historically amd64, but should change someday) |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
117 |
OS_ARCH_X64_NAME:=amd64 |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
118 |
#OS_ARCH_X64_NAME:=x64 |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
119 |
|
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
120 |
# Alternate arch names (in case this arch is known by a second name) |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
121 |
# PROBLEM_LISTS may use either name. |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
122 |
OS_ARCH2-amd64:=x64 |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
123 |
#OS_ARCH2-x64:=amd64 |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
124 |
|
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
125 |
# Try and use the arch names consistently |
5611
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
126 |
OS_ARCH:=$(patsubst x64,$(OS_ARCH_X64_NAME),$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
127 |
OS_ARCH:=$(patsubst X64,$(OS_ARCH_X64_NAME),$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
128 |
OS_ARCH:=$(patsubst AMD64,$(OS_ARCH_X64_NAME),$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
129 |
OS_ARCH:=$(patsubst amd64,$(OS_ARCH_X64_NAME),$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
130 |
OS_ARCH:=$(patsubst x86_64,$(OS_ARCH_X64_NAME),$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
131 |
OS_ARCH:=$(patsubst 8664,$(OS_ARCH_X64_NAME),$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
132 |
OS_ARCH:=$(patsubst EM64T,$(OS_ARCH_X64_NAME),$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
133 |
OS_ARCH:=$(patsubst em64t,$(OS_ARCH_X64_NAME),$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
134 |
OS_ARCH:=$(patsubst intel64,$(OS_ARCH_X64_NAME),$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
135 |
OS_ARCH:=$(patsubst Intel64,$(OS_ARCH_X64_NAME),$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
136 |
OS_ARCH:=$(patsubst INTEL64,$(OS_ARCH_X64_NAME),$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
137 |
OS_ARCH:=$(patsubst IA64,ia64,$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
138 |
OS_ARCH:=$(patsubst X86,i586,$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
139 |
OS_ARCH:=$(patsubst x86,i586,$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
140 |
OS_ARCH:=$(patsubst i386,i586,$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
141 |
OS_ARCH:=$(patsubst i486,i586,$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
142 |
OS_ARCH:=$(patsubst i686,i586,$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
143 |
OS_ARCH:=$(patsubst 386,i586,$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
144 |
OS_ARCH:=$(patsubst 486,i586,$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
145 |
OS_ARCH:=$(patsubst 586,i586,$(OS_ARCH)) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
146 |
OS_ARCH:=$(patsubst 686,i586,$(OS_ARCH)) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
147 |
|
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
148 |
# Default ARCH_DATA_MODEL settings |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
149 |
ARCH_DATA_MODEL-i586 = 32 |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
150 |
ARCH_DATA_MODEL-$(OS_ARCH_X64_NAME) = 64 |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
151 |
ARCH_DATA_MODEL-ia64 = 64 |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
152 |
ARCH_DATA_MODEL-sparc = 32 |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
153 |
ARCH_DATA_MODEL-sparcv9 = 64 |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
154 |
|
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
155 |
# If ARCH_DATA_MODEL is not defined, try and pick a reasonable default |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
156 |
ifndef ARCH_DATA_MODEL |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
157 |
ARCH_DATA_MODEL:=$(ARCH_DATA_MODEL-$(OS_ARCH)) |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
158 |
endif |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
159 |
ifndef ARCH_DATA_MODEL |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
160 |
ARCH_DATA_MODEL=32 |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
161 |
endif |
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
162 |
|
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
163 |
# Platform directory name |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
164 |
PLATFORM_OS = $(OS_NAME)-$(OS_ARCH) |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
165 |
|
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
166 |
# Check ARCH_DATA_MODEL, adjust OS_ARCH accordingly on solaris |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
167 |
ARCH_DATA_MODEL_ERROR= \ |
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
168 |
ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) cannot be used with $(PLATFORM_OS) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
169 |
ifeq ($(ARCH_DATA_MODEL),64) |
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
170 |
ifeq ($(PLATFORM_OS),solaris-i586) |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
171 |
OS_ARCH=$(OS_ARCH_X64_NAME) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
172 |
endif |
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
173 |
ifeq ($(PLATFORM_OS),solaris-sparc) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
174 |
OS_ARCH=sparcv9 |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
175 |
endif |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
176 |
ifeq ($(OS_ARCH),i586) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
177 |
x:=$(warning "WARNING: $(ARCH_DATA_MODEL_ERROR)") |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
178 |
endif |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
179 |
ifeq ($(OS_ARCH),sparc) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
180 |
x:=$(warning "WARNING: $(ARCH_DATA_MODEL_ERROR)") |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
181 |
endif |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
182 |
else |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
183 |
ifeq ($(ARCH_DATA_MODEL),32) |
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
184 |
ifeq ($(OS_ARCH),$(OS_ARCH_X64_NAME)) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
185 |
x:=$(warning "WARNING: $(ARCH_DATA_MODEL_ERROR)") |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
186 |
endif |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
187 |
ifeq ($(OS_ARCH),ia64) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
188 |
x:=$(warning "WARNING: $(ARCH_DATA_MODEL_ERROR)") |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
189 |
endif |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
190 |
ifeq ($(OS_ARCH),sparcv9) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
191 |
x:=$(warning "WARNING: $(ARCH_DATA_MODEL_ERROR)") |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
192 |
endif |
2 | 193 |
else |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
194 |
x:=$(warning "WARNING: $(ARCH_DATA_MODEL_ERROR)") |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
195 |
endif |
2 | 196 |
endif |
197 |
||
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
198 |
# Alternate OS_ARCH name (defaults to OS_ARCH) |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
199 |
OS_ARCH2:=$(OS_ARCH2-$(OS_ARCH)) |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
200 |
ifeq ($(OS_ARCH2),) |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
201 |
OS_ARCH2:=$(OS_ARCH) |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
202 |
endif |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
203 |
|
2 | 204 |
# Root of this test area (important to use full paths in some places) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
205 |
TEST_ROOT := $(shell $(PWD)) |
2 | 206 |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
207 |
# Root of all test results |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
208 |
ifdef ALT_OUTPUTDIR |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
209 |
ABS_OUTPUTDIR = $(ALT_OUTPUTDIR) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
210 |
else |
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
211 |
ABS_OUTPUTDIR = $(TEST_ROOT)/../build/$(PLATFORM_OS) |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
212 |
endif |
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
213 |
ABS_PLATFORM_BUILD_ROOT = $(ABS_OUTPUTDIR) |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
214 |
ABS_TEST_OUTPUT_DIR := $(ABS_PLATFORM_BUILD_ROOT)/testoutput/$(UNIQUE_DIR) |
2 | 215 |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
216 |
# Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
217 |
ifndef PRODUCT_HOME |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
218 |
# Try to use j2sdk-image if it exists |
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
219 |
ABS_JDK_IMAGE = $(ABS_PLATFORM_BUILD_ROOT)/j2sdk-image |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
220 |
PRODUCT_HOME := \ |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
221 |
$(shell \ |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
222 |
if [ -d $(ABS_JDK_IMAGE) ] ; then \ |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
223 |
$(ECHO) "$(ABS_JDK_IMAGE)"; \ |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
224 |
else \ |
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
225 |
$(ECHO) "$(ABS_PLATFORM_BUILD_ROOT)"; \ |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
226 |
fi) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
227 |
PRODUCT_HOME := $(PRODUCT_HOME) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
228 |
endif |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
229 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
230 |
# Expect JPRT to set JPRT_PRODUCT_ARGS (e.g. -server etc.) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
231 |
# Should be passed into 'java' only. |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
232 |
# Could include: -d64 -server -client OR any java option |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
233 |
ifdef JPRT_PRODUCT_ARGS |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
234 |
JAVA_ARGS = $(JPRT_PRODUCT_ARGS) |
2 | 235 |
endif |
236 |
||
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
237 |
# Expect JPRT to set JPRT_PRODUCT_VM_ARGS (e.g. -Xcomp etc.) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
238 |
# Should be passed into anything running the vm (java, javac, javadoc, ...). |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
239 |
ifdef JPRT_PRODUCT_VM_ARGS |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
240 |
JAVA_VM_ARGS = $(JPRT_PRODUCT_VM_ARGS) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
241 |
endif |
2 | 242 |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
243 |
# Check JAVA_ARGS arguments based on ARCH_DATA_MODEL etc. |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
244 |
ifeq ($(OS_NAME),solaris) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
245 |
D64_ERROR_MESSAGE=Mismatch between ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) and use of -d64 in JAVA_ARGS=$(JAVA_ARGS) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
246 |
ifeq ($(ARCH_DATA_MODEL),32) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
247 |
ifneq ($(findstring -d64,$(JAVA_ARGS)),) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
248 |
x:=$(warning "WARNING: $(D64_ERROR_MESSAGE)") |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
249 |
endif |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
250 |
endif |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
251 |
ifeq ($(ARCH_DATA_MODEL),64) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
252 |
ifeq ($(findstring -d64,$(JAVA_ARGS)),) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
253 |
x:=$(warning "WARNING: $(D64_ERROR_MESSAGE)") |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
254 |
endif |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
255 |
endif |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
256 |
endif |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
257 |
|
5611
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
258 |
# Macro to run make and set the shared library permissions |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
259 |
define SharedLibraryPermissions |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
260 |
$(MAKE) SHARED_LIBRARY_DIR=$1 UNIQUE_DIR=$@ shared_library_permissions |
5600
8ca34998a6b3
6943915: Adjust jdk/test/Makefile to deal with .dll and .so libraries needing execute permissions
ohair
parents:
5149
diff
changeset
|
261 |
endef |
8ca34998a6b3
6943915: Adjust jdk/test/Makefile to deal with .dll and .so libraries needing execute permissions
ohair
parents:
5149
diff
changeset
|
262 |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
263 |
# Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
264 |
ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
265 |
ifdef JPRT_ARCHIVE_BUNDLE |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
266 |
ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
267 |
endif |
2 | 268 |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
269 |
# How to create the test bundle (pass or fail, we want to create this) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
270 |
# Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed. |
5600
8ca34998a6b3
6943915: Adjust jdk/test/Makefile to deal with .dll and .so libraries needing execute permissions
ohair
parents:
5149
diff
changeset
|
271 |
ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` \ |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
272 |
&& $(CD) $(ABS_TEST_OUTPUT_DIR) \ |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
273 |
&& $(CHMOD) -R a+r . \ |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
274 |
&& $(ZIP) -q -r $(ARCHIVE_BUNDLE) . ) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
275 |
SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTreport/text/summary.txt |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
276 |
STATS_TXT_NAME = Stats.txt |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
277 |
STATS_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/$(STATS_TXT_NAME) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
278 |
RUNLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/runlist.txt |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
279 |
PASSLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/passlist.txt |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
280 |
FAILLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/faillist.txt |
4342
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
281 |
EXITCODE = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/exitcode.txt |
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
282 |
|
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
283 |
TESTEXIT = \ |
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
284 |
if [ ! -s $(EXITCODE) ] ; then \ |
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
285 |
$(ECHO) "ERROR: EXITCODE file not filled in."; \ |
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
286 |
$(ECHO) "1" > $(EXITCODE); \ |
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
287 |
fi ; \ |
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
288 |
testExitCode=`$(CAT) $(EXITCODE)`; \ |
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
289 |
$(ECHO) "EXIT CODE: $${testExitCode}"; \ |
4514 | 290 |
exit $${testExitCode} |
4342
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
291 |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
292 |
BUNDLE_UP_AND_EXIT = \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
293 |
( \ |
4342
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
294 |
jtregExitCode=$$? && \ |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
295 |
_summary="$(SUMMARY_TXT)"; \ |
4342
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
296 |
$(RM) -f $(STATS_TXT) $(RUNLIST) $(PASSLIST) $(FAILLIST) $(EXITCODE); \ |
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
297 |
$(ECHO) "$${jtregExitCode}" > $(EXITCODE); \ |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
298 |
if [ -r "$${_summary}" ] ; then \ |
4514 | 299 |
$(ECHO) "Summary: $(UNIQUE_DIR)" > $(STATS_TXT); \ |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
300 |
$(EXPAND) $${_summary} | $(EGREP) -v ' Not run\.' > $(RUNLIST); \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
301 |
$(EGREP) ' Passed\.' $(RUNLIST) \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
302 |
| $(EGREP) -v ' Error\.' \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
303 |
| $(EGREP) -v ' Failed\.' > $(PASSLIST); \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
304 |
( $(EGREP) ' Failed\.' $(RUNLIST); \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
305 |
$(EGREP) ' Error\.' $(RUNLIST); \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
306 |
$(EGREP) -v ' Passed\.' $(RUNLIST) ) \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
307 |
| $(SORT) | $(UNIQ) > $(FAILLIST); \ |
4342
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
308 |
if [ $${jtregExitCode} != 0 -o -s $(FAILLIST) ] ; then \ |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
309 |
$(EXPAND) $(FAILLIST) \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
310 |
| $(CUT) -d' ' -f1 \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
311 |
| $(SED) -e 's@^@FAILED: @' >> $(STATS_TXT); \ |
4342
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
312 |
if [ $${jtregExitCode} = 0 ] ; then \ |
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
313 |
jtregExitCode=1; \ |
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
314 |
fi; \ |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
315 |
fi; \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
316 |
runc="`$(CAT) $(RUNLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
317 |
passc="`$(CAT) $(PASSLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
318 |
failc="`$(CAT) $(FAILLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
319 |
exclc="`$(CAT) $(EXCLUDELIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ |
5813
8e455cd3e807
6962617: Testcase changes, cleanup of problem list for jdk_tools targets
ohair
parents:
5627
diff
changeset
|
320 |
$(ECHO) "TEST STATS: name=$(UNIQUE_DIR) run=$${runc} pass=$${passc} fail=$${failc} excluded=$${exclc}" \ |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
321 |
>> $(STATS_TXT); \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
322 |
else \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
323 |
$(ECHO) "Missing file: $${_summary}" >> $(STATS_TXT); \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
324 |
fi; \ |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
325 |
if [ -f $(STATS_TXT) ] ; then \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
326 |
$(CAT) $(STATS_TXT); \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
327 |
fi; \ |
4991
38f33163acce
6915983: testing problems, adjusting list of tests, needs some investigation
ohair
parents:
4517
diff
changeset
|
328 |
$(ZIP_UP_RESULTS) ; \ |
4342
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
329 |
$(TESTEXIT) \ |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
330 |
) |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
331 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
332 |
################################################################ |
2 | 333 |
|
11281 | 334 |
# Default make rule (runs default jdk tests) |
335 |
all: jdk_default |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
336 |
@$(ECHO) "Testing completed successfully" |
2 | 337 |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
338 |
# Prep for output |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
339 |
prep: clean |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
340 |
@$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR) |
5813
8e455cd3e807
6962617: Testcase changes, cleanup of problem list for jdk_tools targets
ohair
parents:
5627
diff
changeset
|
341 |
@$(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` |
2 | 342 |
|
343 |
# Cleanup |
|
344 |
clean: |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
345 |
$(RM) -r $(ABS_TEST_OUTPUT_DIR) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
346 |
$(RM) $(ARCHIVE_BUNDLE) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
347 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
348 |
################################################################ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
349 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
350 |
# jtreg tests |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
351 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
352 |
# Expect JT_HOME to be set for jtreg tests. (home for jtreg) |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
353 |
ifndef JT_HOME |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
354 |
JT_HOME = $(SLASH_JAVA)/re/jtreg/4.1/promoted/latest/binaries/jtreg |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
355 |
ifdef JPRT_JTREG_HOME |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
356 |
JT_HOME = $(JPRT_JTREG_HOME) |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
357 |
endif |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
358 |
endif |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
359 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
360 |
# Expect JPRT to set TESTDIRS to the jtreg test dirs |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
361 |
ifndef TESTDIRS |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
362 |
TESTDIRS = demo |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
363 |
endif |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
364 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
365 |
# Agentvm settings (default is false) |
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
366 |
ifndef USE_JTREG_AGENTVM |
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
367 |
USE_JTREG_AGENTVM=false |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
368 |
endif |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
369 |
# With agentvm, you cannot use -javaoptions? |
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
370 |
ifeq ($(USE_JTREG_AGENTVM),true) |
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
371 |
JTREG_AGENTVM_OPTION = -agentvm |
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
372 |
EXTRA_JTREG_OPTIONS += $(JTREG_AGENTVM_OPTION) $(JAVA_ARGS) $(JAVA_ARGS:%=-vmoption:%) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
373 |
JTREG_TEST_OPTIONS = $(JAVA_VM_ARGS:%=-vmoption:%) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
374 |
else |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
375 |
JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
376 |
endif |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
377 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
378 |
ifdef CONCURRENCY |
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
379 |
EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY) |
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
380 |
endif |
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
381 |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
382 |
# Some tests annoy me and fail frequently |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
383 |
PROBLEM_LIST=ProblemList.txt |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
384 |
PROBLEM_LISTS=$(PROBLEM_LIST) $(wildcard closed/$(PROBLEM_LIST)) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
385 |
EXCLUDELIST=$(ABS_TEST_OUTPUT_DIR)/excludelist.txt |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
386 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
387 |
# Create exclude list for this platform and arch |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
388 |
ifdef NO_EXCLUDES |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
389 |
$(EXCLUDELIST): $(PROBLEM_LISTS) $(TEST_DEPENDENCIES) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
390 |
@$(ECHO) "NOTHING_EXCLUDED" > $@ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
391 |
else |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
392 |
$(EXCLUDELIST): $(PROBLEM_LISTS) $(TEST_DEPENDENCIES) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
393 |
@$(RM) $@ $@.temp1 $@.temp2 |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
394 |
@(($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-all' ) ;\ |
5813
8e455cd3e807
6962617: Testcase changes, cleanup of problem list for jdk_tools targets
ohair
parents:
5627
diff
changeset
|
395 |
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(PLATFORM_OS)' ) ;\ |
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
396 |
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH2)' ) ;\ |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
397 |
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_VERSION)') ;\ |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
398 |
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH)' ) ;\ |
5149
efce9634bfc0
6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents:
4991
diff
changeset
|
399 |
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH2)' ) ;\ |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
400 |
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-all' ) ;\ |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
401 |
($(ECHO) "#") ;\ |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
402 |
) | $(SED) -e 's@^[\ ]*@@' \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
403 |
| $(EGREP) -v '^#' > $@.temp1 |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
404 |
for tdir in $(TESTDIRS) SOLARIS_10_SH_BUG_NO_EMPTY_FORS ; do \ |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
405 |
( ( $(CAT) $@.temp1 | $(EGREP) "^$${tdir}" ) ; $(ECHO) "#" ) >> $@.temp2 ; \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
406 |
done |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
407 |
@$(ECHO) "# at least one line" >> $@.temp2 |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
408 |
@( $(EGREP) -v '^#' $@.temp2 ; true ) > $@ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
409 |
@$(ECHO) "Excluding list contains `$(EXPAND) $@ | $(WC) -l` items" |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
410 |
endif |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
411 |
|
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
412 |
# Select list of directories that exist |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
413 |
define TestDirs |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
414 |
$(foreach i,$1,$(wildcard ${i})) $(foreach i,$1,$(wildcard closed/${i})) |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
415 |
endef |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
416 |
# Running batches of tests with or without agentvm |
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
417 |
define RunAgentvmBatch |
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
418 |
$(ECHO) "Running tests in agentvm mode: $?" |
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
419 |
$(MAKE) TEST_DEPENDENCIES="$?" TESTDIRS="$?" USE_JTREG_AGENTVM=true UNIQUE_DIR=$@ jtreg_tests |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
420 |
endef |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
421 |
define RunOthervmBatch |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
422 |
$(ECHO) "Running tests in othervm mode: $?" |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
423 |
$(MAKE) TEST_DEPENDENCIES="$?" TESTDIRS="$?" USE_JTREG_AGENTVM=false UNIQUE_DIR=$@ jtreg_tests |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
424 |
endef |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
425 |
define SummaryInfo |
4514 | 426 |
$(ECHO) "########################################################" |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
427 |
$(CAT) $(?:%=$(ABS_TEST_OUTPUT_DIR)/%/$(STATS_TXT_NAME)) |
4514 | 428 |
$(ECHO) "########################################################" |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
429 |
endef |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
430 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
431 |
# ------------------------------------------------------------------ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
432 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
433 |
# Batches of tests (somewhat arbitrary assigments to jdk_* targets) |
11281 | 434 |
JDK_DEFAULT_TARGETS = |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
435 |
JDK_ALL_TARGETS = |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
436 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
437 |
# Stable othervm testruns (minus items from PROBLEM_LIST) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
438 |
# Using agentvm has problems, and doesn't help performance as much as others. |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
439 |
JDK_ALL_TARGETS += jdk_awt |
10435 | 440 |
jdk_awt: $(call TestDirs, com/sun/awt java/awt sun/awt \ |
441 |
javax/imageio javax/print sun/pisces) |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
442 |
$(call RunOthervmBatch) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
443 |
|
11910
5ebe67376f05
7147087: Remove AWT/Swing/client tests from ProblemList
alanb
parents:
11840
diff
changeset
|
444 |
# Stable othervm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
445 |
JDK_ALL_TARGETS += jdk_beans1 |
11281 | 446 |
JDK_DEFAULT_TARGETS += jdk_beans1 |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
447 |
jdk_beans1: $(call TestDirs, \ |
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
448 |
java/beans/beancontext java/beans/PropertyChangeSupport \ |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
449 |
java/beans/Introspector java/beans/Performance \ |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
450 |
java/beans/VetoableChangeSupport java/beans/Statement) |
11910
5ebe67376f05
7147087: Remove AWT/Swing/client tests from ProblemList
alanb
parents:
11840
diff
changeset
|
451 |
$(call RunOthervmBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
452 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
453 |
# Stable othervm testruns (minus items from PROBLEM_LIST) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
454 |
# Using agentvm has serious problems with these tests |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
455 |
JDK_ALL_TARGETS += jdk_beans2 |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
456 |
jdk_beans2: $(call TestDirs, \ |
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
457 |
java/beans/Beans java/beans/EventHandler java/beans/XMLDecoder \ |
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
458 |
java/beans/PropertyEditor) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
459 |
$(call RunOthervmBatch) |
4514 | 460 |
|
461 |
# Stable othervm testruns (minus items from PROBLEM_LIST) |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
462 |
# Using agentvm has serious problems with these tests |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
463 |
JDK_ALL_TARGETS += jdk_beans3 |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
464 |
jdk_beans3: $(call TestDirs, java/beans/XMLEncoder) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
465 |
$(call RunOthervmBatch) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
466 |
|
4514 | 467 |
# All beans tests |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
468 |
jdk_beans: jdk_beans1 jdk_beans2 jdk_beans3 |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
469 |
@$(SummaryInfo) |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
470 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
471 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
472 |
JDK_ALL_TARGETS += jdk_io |
11281 | 473 |
JDK_DEFAULT_TARGETS += jdk_io |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
474 |
jdk_io: $(call TestDirs, java/io) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
475 |
$(call RunAgentvmBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
476 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
477 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
478 |
JDK_ALL_TARGETS += jdk_lang |
11281 | 479 |
JDK_DEFAULT_TARGETS += jdk_lang |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
480 |
jdk_lang: $(call TestDirs, java/lang) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
481 |
$(call RunAgentvmBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
482 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
483 |
# Stable othervm testruns (minus items from PROBLEM_LIST) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
484 |
# Using agentvm has serious problems with these tests |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
485 |
JDK_ALL_TARGETS += jdk_management1 |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
486 |
jdk_management1: $(call TestDirs, javax/management) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
487 |
$(call RunOthervmBatch) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
488 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
489 |
# Stable othervm testruns (minus items from PROBLEM_LIST) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
490 |
# Using agentvm has serious problems with these tests |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
491 |
JDK_ALL_TARGETS += jdk_management2 |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
492 |
jdk_management2: $(call TestDirs, com/sun/jmx com/sun/management sun/management) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
493 |
$(call RunOthervmBatch) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
494 |
|
4514 | 495 |
# All management tests |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
496 |
jdk_management: jdk_management1 jdk_management2 |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
497 |
@$(SummaryInfo) |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
498 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
499 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
500 |
JDK_ALL_TARGETS += jdk_math |
11281 | 501 |
JDK_DEFAULT_TARGETS += jdk_math |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
502 |
jdk_math: $(call TestDirs, java/math) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
503 |
$(call RunAgentvmBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
504 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
505 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
506 |
JDK_ALL_TARGETS += jdk_misc |
11281 | 507 |
JDK_DEFAULT_TARGETS += jdk_misc |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
508 |
jdk_misc: $(call TestDirs, \ |
10435 | 509 |
demo/jvmti demo/zipfs javax/naming javax/script \ |
510 |
javax/smartcardio com/sun/jndi com/sun/xml sun/misc) |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
511 |
$(call RunAgentvmBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
512 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
513 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
514 |
JDK_ALL_TARGETS += jdk_net |
11281 | 515 |
JDK_DEFAULT_TARGETS += jdk_net |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
516 |
jdk_net: $(call TestDirs, com/sun/net java/net sun/net) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
517 |
$(call RunAgentvmBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
518 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
519 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
520 |
JDK_ALL_TARGETS += jdk_nio1 |
11281 | 521 |
JDK_DEFAULT_TARGETS += jdk_nio1 |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
522 |
jdk_nio1: $(call TestDirs, java/nio/file) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
523 |
$(call RunAgentvmBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
524 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
525 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
526 |
JDK_ALL_TARGETS += jdk_nio2 |
11281 | 527 |
JDK_DEFAULT_TARGETS += jdk_nio2 |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
528 |
jdk_nio2: $(call TestDirs, java/nio/Buffer java/nio/ByteOrder \ |
11840 | 529 |
java/nio/channels java/nio/MappedByteBuffer sun/nio/ch) |
5611
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
530 |
$(call SharedLibraryPermissions,java/nio/channels) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
531 |
$(call RunAgentvmBatch) |
4514 | 532 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
533 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
534 |
JDK_ALL_TARGETS += jdk_nio3 |
11281 | 535 |
JDK_DEFAULT_TARGETS += jdk_nio3 |
11840 | 536 |
jdk_nio3: $(call TestDirs, java/nio/charset sun/nio/cs) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
537 |
$(call RunAgentvmBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
538 |
|
4514 | 539 |
# All nio tests |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
540 |
jdk_nio: jdk_nio1 jdk_nio2 jdk_nio3 |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
541 |
@$(SummaryInfo) |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
542 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
543 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
10064
9f56d9f43ec1
7057935: com/sun/nio/sctp tests should be moved out of jdk_nio and into their own target, jdk_sctp
chegar
parents:
10061
diff
changeset
|
544 |
jdk_sctp: $(call TestDirs, com/sun/nio/sctp) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
545 |
$(call RunAgentvmBatch) |
10064
9f56d9f43ec1
7057935: com/sun/nio/sctp tests should be moved out of jdk_nio and into their own target, jdk_sctp
chegar
parents:
10061
diff
changeset
|
546 |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
547 |
# Stable othervm testruns (minus items from PROBLEM_LIST) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
548 |
# Using agentvm has serious problems with these tests |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
549 |
JDK_ALL_TARGETS += jdk_rmi |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
550 |
jdk_rmi: $(call TestDirs, java/rmi javax/rmi sun/rmi) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
551 |
$(call RunOthervmBatch) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
552 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
553 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
554 |
JDK_ALL_TARGETS += jdk_security1 |
11281 | 555 |
JDK_DEFAULT_TARGETS += jdk_security1 |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
556 |
jdk_security1: $(call TestDirs, java/security) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
557 |
$(call RunAgentvmBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
558 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
559 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
560 |
JDK_ALL_TARGETS += jdk_security2 |
10416 | 561 |
jdk_security2: $(call TestDirs, javax/crypto javax/xml/crypto com/sun/crypto) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
562 |
$(call RunAgentvmBatch) |
4514 | 563 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
564 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
565 |
JDK_ALL_TARGETS += jdk_security3 |
10435 | 566 |
jdk_security3: $(call TestDirs, com/sun/security lib/security javax/security \ |
11523
85131f3172a1
7088989: Improve the performance for T4 by utilizing the newly provided crypto APIs
valeriep
parents:
11281
diff
changeset
|
567 |
sun/security com/sun/org/apache/xml/internal/security \ |
11686
398118274810
7136538: typo in test/Makefile under the jdk_security3 target
valeriep
parents:
11523
diff
changeset
|
568 |
com/oracle/security/ucrypto) |
5611
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
569 |
$(call SharedLibraryPermissions,sun/security) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
570 |
$(call RunAgentvmBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
571 |
|
4514 | 572 |
# All security tests |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
573 |
jdk_security: jdk_security1 jdk_security2 jdk_security3 |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
574 |
@$(SummaryInfo) |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
575 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
576 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
10435 | 577 |
JDK_ALL_TARGETS += jdk_sound |
578 |
jdk_sound: $(call TestDirs, javax/sound) |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
579 |
$(call RunAgentvmBatch) |
10435 | 580 |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
581 |
# Stable othervm testruns (minus items from PROBLEM_LIST) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
582 |
# Using agentvm has problems, and doesn't help performance as much as others. |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
583 |
JDK_ALL_TARGETS += jdk_swing |
10435 | 584 |
jdk_swing: $(call TestDirs, javax/swing sun/java2d \ |
585 |
demo/jfc com/sun/java/swing) |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
586 |
$(call RunOthervmBatch) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
587 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
588 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
589 |
JDK_ALL_TARGETS += jdk_text |
11281 | 590 |
JDK_DEFAULT_TARGETS += jdk_text |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
591 |
jdk_text: $(call TestDirs, java/text sun/text) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
592 |
$(call RunAgentvmBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
593 |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
594 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
595 |
JDK_ALL_TARGETS += jdk_tools1 |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
596 |
jdk_tools1: $(call TestDirs, com/sun/jdi) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
597 |
$(call RunAgentvmBatch) |
4514 | 598 |
|
599 |
# Stable othervm testruns (minus items from PROBLEM_LIST) |
|
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
600 |
# Using agentvm has serious problems with these tests |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
601 |
JDK_ALL_TARGETS += jdk_tools2 |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
602 |
jdk_tools2: $(call TestDirs, \ |
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
603 |
com/sun/tools sun/jvmstat sun/tools tools vm \ |
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
604 |
com/sun/servicetag com/sun/tracing) |
5611
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
605 |
$(call SharedLibraryPermissions,tools/launcher) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
606 |
$(call RunAgentvmBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
607 |
|
4514 | 608 |
# All tools tests |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
609 |
jdk_tools: jdk_tools1 jdk_tools2 |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
610 |
@$(SummaryInfo) |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
611 |
|
12887 | 612 |
# Stable othervm testruns (minus items from PROBLEM_LIST) |
613 |
# Using agentvm has serious problems with these tests |
|
614 |
ifdef OPENJDK |
|
615 |
jdk_jfr: |
|
616 |
else |
|
617 |
JDK_ALL_TARGETS += jdk_jfr |
|
618 |
jdk_jfr: $(call TestDirs, com/oracle/jfr) |
|
619 |
$(call RunOthervmBatch) |
|
620 |
endif |
|
621 |
||
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
622 |
# Stable agentvm testruns (minus items from PROBLEM_LIST) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
623 |
JDK_ALL_TARGETS += jdk_util |
11281 | 624 |
JDK_DEFAULT_TARGETS += jdk_util |
8769
728aa3db9869
7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents:
5970
diff
changeset
|
625 |
jdk_util: $(call TestDirs, java/util sun/util) |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
626 |
$(call RunAgentvmBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
627 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
628 |
# ------------------------------------------------------------------ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
629 |
|
11281 | 630 |
# Run default tests |
631 |
jdk_default: $(JDK_DEFAULT_TARGETS) |
|
632 |
@$(SummaryInfo) |
|
633 |
||
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
634 |
# Run all tests |
11281 | 635 |
jdk_all: $(JDK_ALL_TARGETS) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
636 |
@$(SummaryInfo) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
637 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
638 |
# These are all phony targets |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
639 |
PHONY_LIST += $(JDK_ALL_TARGETS) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
640 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
641 |
# ------------------------------------------------------------------ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
642 |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
643 |
# Default JTREG to run (win32 script works for everybody) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
644 |
JTREG = $(JT_HOME)/win32/bin/jtreg |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
645 |
# Add any extra options (agentvm etc.) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
646 |
JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
647 |
# Only run automatic tests |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
648 |
JTREG_BASIC_OPTIONS += -a |
4517
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
649 |
# Always turn on assertions |
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
650 |
JTREG_ASSERT_OPTION = -ea -esa |
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
651 |
JTREG_BASIC_OPTIONS += $(JTREG_ASSERT_OPTION) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
652 |
# Report details on all failed or error tests, times too |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
653 |
JTREG_BASIC_OPTIONS += -v:fail,error,time |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
654 |
# Retain all files for failing tests |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
655 |
JTREG_BASIC_OPTIONS += -retain:fail,error |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
656 |
# Ignore tests are not run and completely silent about it |
4517
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
657 |
JTREG_IGNORE_OPTION = -ignore:quiet |
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
658 |
JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION) |
4514 | 659 |
# Multiple by 4 the timeout numbers |
4517
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
660 |
JTREG_TIMEOUT_OPTION = -timeoutFactor:4 |
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
661 |
JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
662 |
# Boost the max memory for jtreg to avoid gc thrashing |
4517
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
663 |
JTREG_MEMORY_OPTION = -J-Xmx512m |
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
664 |
JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
665 |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
666 |
# Make sure jtreg exists |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
667 |
$(JTREG): $(JT_HOME) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
668 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
669 |
# Run jtreg |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
670 |
jtreg_tests: prep $(PRODUCT_HOME) $(JTREG) $(EXCLUDELIST) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
671 |
@$(EXPAND) $(EXCLUDELIST) \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
672 |
| $(CUT) -d' ' -f1 \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
673 |
| $(SED) -e 's@^@Excluding: @' |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
674 |
( \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
675 |
( JT_HOME=$(shell $(GETMIXEDPATH) "$(JT_HOME)"); \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
676 |
export JT_HOME; \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
677 |
$(shell $(GETMIXEDPATH) "$(JTREG)") \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
678 |
$(JTREG_BASIC_OPTIONS) \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
679 |
-r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTreport \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
680 |
-w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTwork \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
681 |
-jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
682 |
-exclude:$(shell $(GETMIXEDPATH) "$(EXCLUDELIST)") \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
683 |
$(JTREG_TEST_OPTIONS) \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
684 |
$(TESTDIRS) \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
685 |
) ; $(BUNDLE_UP_AND_EXIT) \ |
4342
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
686 |
) 2>&1 | $(TEE) $(ABS_TEST_OUTPUT_DIR)/output.txt ; $(TESTEXIT) |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
687 |
|
5611
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
688 |
# Rule that may change execute permissions on shared library files. |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
689 |
# Files in repositories should never have execute permissions, but there |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
690 |
# are some tests that have pre-built shared libraries, and these windows |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
691 |
# dll files must have execute permission. Adding execute permission |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
692 |
# may happen automatically on windows when using certain versions of mercurial |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
693 |
# but it cannot be guaranteed. And blindly adding execute permission might |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
694 |
# be seen as a mercurial 'change', so we avoid adding execute permission to |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
695 |
# repository files. But testing from a plain source tree needs the chmod a+rx. |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
696 |
# Used on select directories and applying the chmod to all shared libraries |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
697 |
# not just dll files. On windows, this may not work with MKS if the files |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
698 |
# were installed with CYGWIN unzip or untar (MKS chmod may not do anything). |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
699 |
# And with CYGWIN and sshd service, you may need CYGWIN=ntsec for this to work. |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
700 |
# |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
701 |
shared_library_permissions: $(SHARED_LIBRARY_DIR) |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
702 |
if [ ! -d $(TEST_ROOT)/../.hg ] ; then \ |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
703 |
$(FIND) $< \( -name \*.dll -o -name \*.DLL -o -name \*.so \) \ |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
704 |
-exec $(CHMOD) a+rx {} \; ; \ |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
705 |
fi |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
706 |
|
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
707 |
PHONY_LIST += jtreg_tests shared_library_permissions |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
708 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
709 |
################################################################ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
710 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
711 |
# packtest |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
712 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
713 |
# Expect JPRT to set JPRT_PACKTEST_HOME. |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
714 |
PACKTEST_HOME = /net/jprt-web.sfbay.sun.com/jprt/allproducts/packtest |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
715 |
ifdef JPRT_PACKTEST_HOME |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
716 |
PACKTEST_HOME = $(JPRT_PACKTEST_HOME) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
717 |
endif |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
718 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
719 |
packtest: prep $(PACKTEST_HOME)/ptest $(PRODUCT_HOME) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
720 |
( $(CD) $(PACKTEST_HOME) && \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
721 |
$(PACKTEST_HOME)/ptest \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
722 |
-t "$(PRODUCT_HOME)" \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
723 |
$(PACKTEST_STRESS_OPTION) \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
724 |
$(EXTRA_PACKTEST_OPTIONS) \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
725 |
-W $(ABS_TEST_OUTPUT_DIR) \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
726 |
$(JAVA_ARGS:%=-J %) \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
727 |
$(JAVA_VM_ARGS:%=-J %) \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
728 |
) ; $(BUNDLE_UP_AND_EXIT) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
729 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
730 |
packtest_stress: PACKTEST_STRESS_OPTION=-s |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
731 |
packtest_stress: packtest |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
732 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
733 |
PHONY_LIST += packtest packtest_stress |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
734 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
735 |
################################################################ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
736 |
|
9013
eedac0b9f552
7024172: Move BufferPoolMXBean and PlatformLoggingMXBean java.lang.management
mchung
parents:
8992
diff
changeset
|
737 |
# perftest to collect statistics |
2930
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
738 |
|
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
739 |
# Expect JPRT to set JPRT_PACKTEST_HOME. |
5611
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
740 |
PERFTEST_HOME = $(TEST_ROOT)/perf |
2930
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
741 |
ifdef JPRT_PERFTEST_HOME |
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
742 |
PERFTEST_HOME = $(JPRT_PERFTEST_HOME) |
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
743 |
endif |
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
744 |
|
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
745 |
perftest: ( $(PERFTEST_HOME)/perftest \ |
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
746 |
-t $(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \ |
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
747 |
-w $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)") \ |
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
748 |
-h $(PERFTEST_HOME) \ |
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
749 |
) ; $(BUNDLE_UP_AND_EXIT) |
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
750 |
|
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
751 |
|
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
752 |
PHONY_LIST += perftest |
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
753 |
|
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
754 |
################################################################ |
58a6440b92dc
6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
mchung
parents:
2400
diff
changeset
|
755 |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
756 |
# vmsqe tests |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
757 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
758 |
# Expect JPRT to set JPRT_VMSQE_HOME. |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
759 |
VMSQE_HOME = $(SLASH_JAVA)/sqe/comp/vm/testbase/sqe/vm/current/build/latest/vm |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
760 |
ifdef JPRT_VMSQE_HOME |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
761 |
VMSQE_HOME = $(JPRT_VMSQE_HOME) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
762 |
endif |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
763 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
764 |
# Expect JPRT to set JPRT_RUNVMSQE_HOME. |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
765 |
RUNVMSQE_HOME = /net/jprt-web.sfbay.sun.com/jprt/allproducts/runvmsqe |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
766 |
ifdef JPRT_RUNVMSQE_HOME |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
767 |
RUNVMSQE_HOME = $(JPRT_RUNVMSQE_HOME) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
768 |
endif |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
769 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
770 |
# Expect JPRT to set JPRT_TONGA3_HOME. |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
771 |
TONGA3_HOME = $(SLASH_JAVA)/sqe/tools/gtee/harness/tonga |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
772 |
ifdef JPRT_TONGA3_HOME |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
773 |
TONGA3_HOME = $(JPRT_TONGA3_HOME) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
774 |
endif |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
775 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
776 |
RUNVMSQE_BIN = $(RUNVMSQE_HOME)/bin/runvmsqe |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
777 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
778 |
vmsqe_tests: prep $(VMSQE_HOME)/vm $(TONGA3_HOME) $(RUNVMSQE_BIN) $(PRODUCT_HOME) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
779 |
$(RM) -r $(ABS_TEST_OUTPUT_DIR)/vmsqe |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
780 |
( $(CD) $(ABS_TEST_OUTPUT_DIR) && \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
781 |
$(RUNVMSQE_BIN) \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
782 |
-jdk "$(PRODUCT_HOME)" \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
783 |
-o "$(ABS_TEST_OUTPUT_DIR)/vmsqe" \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
784 |
-testbase "$(VMSQE_HOME)/vm" \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
785 |
-tonga "$(TONGA3_HOME)" \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
786 |
-tongajdk "$(ALT_BOOTDIR)" \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
787 |
$(JAVA_ARGS) \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
788 |
$(JAVA_VM_ARGS) \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
789 |
$(RUNVMSQE_TEST_OPTION) \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
790 |
$(EXTRA_RUNVMSQE_OPTIONS) \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
791 |
) ; $(BUNDLE_UP_AND_EXIT) |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
792 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
793 |
vmsqe_jdwp: RUNVMSQE_TEST_OPTION=-jdwp |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
794 |
vmsqe_jdwp: vmsqe_tests |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
795 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
796 |
vmsqe_jdi: RUNVMSQE_TEST_OPTION=-jdi |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
797 |
vmsqe_jdi: vmsqe_tests |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
798 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
799 |
vmsqe_jdb: RUNVMSQE_TEST_OPTION=-jdb |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
800 |
vmsqe_jdb: vmsqe_tests |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
801 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
802 |
vmsqe_quick-jdi: RUNVMSQE_TEST_OPTION=-quick-jdi |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
803 |
vmsqe_quick-jdi: vmsqe_tests |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
804 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
805 |
vmsqe_sajdi: RUNVMSQE_TEST_OPTION=-sajdi |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
806 |
vmsqe_sajdi: vmsqe_tests |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
807 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
808 |
vmsqe_jvmti: RUNVMSQE_TEST_OPTION=-jvmti |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
809 |
vmsqe_jvmti: vmsqe_tests |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
810 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
811 |
vmsqe_hprof: RUNVMSQE_TEST_OPTION=-hprof |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
812 |
vmsqe_hprof: vmsqe_tests |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
813 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
814 |
vmsqe_monitoring: RUNVMSQE_TEST_OPTION=-monitoring |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
815 |
vmsqe_monitoring: vmsqe_tests |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
816 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
817 |
PHONY_LIST += vmsqe_jdwp vmsqe_jdi vmsqe_jdb vmsqe_quick-jdi vmsqe_sajdi \ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
818 |
vmsqe_jvmti vmsqe_hprof vmsqe_monitoring vmsqe_tests |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
819 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
820 |
################################################################ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
821 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
822 |
# jck tests |
2 | 823 |
|
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
824 |
# Default is to use jck 7 from /java/re |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
825 |
JCK7_DEFAULT_HOME = $(SLASH_JAVA)/re/jck/7/promoted/latest/binaries |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
826 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
827 |
# Expect JPRT to set JPRT_JCK7COMPILER_HOME. |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
828 |
JCK7COMPILER_HOME = $(JCK7_DEFAULT_HOME)/JCK-compiler-7 |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
829 |
ifdef JPRT_JCK7COMPILER_HOME |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
830 |
JCK7COMPILER_HOME = $(JPRT_JCK7COMPILER_HOME)/JCK-compiler-7 |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
831 |
endif |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
832 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
833 |
# Expect JPRT to set JPRT_JCK7RUNTIME_HOME. |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
834 |
JCK7RUNTIME_HOME = $(JCK7_DEFAULT_HOME)/JCK-runtime-7 |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
835 |
ifdef JPRT_JCK7RUNTIME_HOME |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
836 |
JCK7RUNTIME_HOME = $(JPRT_JCK7RUNTIME_HOME)/JCK-runtime-7 |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
837 |
endif |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
838 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
839 |
# Expect JPRT to set JPRT_JCK7DEVTOOLS_HOME. |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
840 |
JCK7DEVTOOLS_HOME = $(JCK7_DEFAULT_HOME)/JCK-devtools-7 |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
841 |
ifdef JPRT_JCK7DEVTOOLS_HOME |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
842 |
JCK7DEVTOOLS_HOME = $(JPRT_JCK7DEVTOOLS_HOME)/JCK-devtools-7 |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
843 |
endif |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
844 |
|
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
845 |
# The jtjck.jar utility to use to run the tests |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
846 |
JTJCK_JAR = $(JCK_HOME)/lib/jtjck.jar |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
847 |
JTJCK_JAVA_ARGS = -XX:MaxPermSize=256m -Xmx512m |
10435 | 848 |
JTJCK_OPTIONS = -headless -v |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
849 |
|
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
850 |
# Default tests to run |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
851 |
ifndef JCK_COMPILER_TESTS |
10435 | 852 |
JCK_COMPILER_TESTS = |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
853 |
endif |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
854 |
ifndef JCK_RUNTIME_TESTS |
10435 | 855 |
JCK_RUNTIME_TESTS = |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
856 |
endif |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
857 |
ifndef JCK_DEVTOOLS_TESTS |
10435 | 858 |
JCK_DEVTOOLS_TESTS = |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
859 |
endif |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
860 |
|
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
861 |
# Generic rule used to run jck tests |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
862 |
_generic_jck_tests: prep $(PRODUCT_HOME) $(EXCLUDELIST) |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
863 |
@$(EXPAND) $(EXCLUDELIST) \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
864 |
| $(CUT) -d' ' -f1 \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
865 |
| $(SED) -e 's@^@Excluding: @' |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
866 |
( $(CD) $(ABS_TEST_OUTPUT_DIR) && \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
867 |
$(PRODUCT_HOME)/bin/java $(JTJCK_JAVA_ARGS) \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
868 |
-jar "$(JTJCK_JAR)" \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
869 |
$(JTJCK_OPTIONS) \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
870 |
-r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTreport \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
871 |
-w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTwork \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
872 |
-jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
873 |
$(TESTDIRS) \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
874 |
) ; $(BUNDLE_UP_AND_EXIT) |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
875 |
|
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
876 |
# JCK7 compiler tests |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
877 |
jck7compiler: |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
878 |
$(MAKE) UNIQUE_DIR=$@ \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
879 |
JCK_HOME=$(JCK7COMPILER_HOME) \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
880 |
TESTDIRS="$(JCK_COMPILER_TESTS)" \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
881 |
_generic_jck_tests |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
882 |
|
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
883 |
# JCK7 runtime tests |
10435 | 884 |
jck7runtime: |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
885 |
$(MAKE) UNIQUE_DIR=$@ \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
886 |
JCK_HOME=$(JCK7RUNTIME_HOME) \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
887 |
TESTDIRS="$(JCK_RUNTIME_TESTS)" \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
888 |
_generic_jck_tests |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
889 |
|
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
890 |
# JCK7 devtools tests |
10435 | 891 |
jck7devtools: |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
892 |
$(MAKE) UNIQUE_DIR=$@ \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
893 |
JCK_HOME=$(JCK7DEVTOOLS_HOME) \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
894 |
TESTDIRS="$(JCK_DEVTOOLS_TESTS)" \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
895 |
_generic_jck_tests |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
896 |
|
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
897 |
# Run all 3 sets of JCK7 tests |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
898 |
jck_all: jck7runtime jck7devtools jck7compiler |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
899 |
|
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
900 |
PHONY_LIST += jck_all _generic_jck_tests \ |
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
901 |
jck7compiler jck7runtime jck7devtools |
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
902 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
903 |
################################################################ |
2 | 904 |
|
905 |
# Phony targets (e.g. these are not filenames) |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
906 |
.PHONY: all clean prep $(PHONY_LIST) |
2 | 907 |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
908 |
################################################################ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
909 |