author | iklam |
Mon, 26 Aug 2013 21:59:50 -0700 | |
changeset 19687 | 30bef3e4f058 |
parent 19063 | 0aa7087394a1 |
child 20839 | a3fd5c769680 |
permissions | -rw-r--r-- |
2 | 1 |
# |
16724
ac2cdc6f5f70
8011187: Remove obsolete/unused targets from jdk/test/Makefile
mduigou
parents:
16722
diff
changeset
|
2 |
# Copyright (c) 1995, 2013, 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 |
16722
17f546b0276a
8010268: Remove dependence upon clean target from jdk/test/Makefile prep target
mduigou
parents:
16507
diff
changeset
|
339 |
prep: |
2400
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: |
|
15656
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
345 |
@$(RM) -r $(ABS_TEST_OUTPUT_DIR) |
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
346 |
@$(RM) $(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
|
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 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
365 |
# 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
|
366 |
PROBLEM_LIST=ProblemList.txt |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
367 |
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
|
368 |
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
|
369 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
370 |
# 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
|
371 |
ifdef NO_EXCLUDES |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
372 |
$(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
|
373 |
@$(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
|
374 |
else |
8992
6a3062c1416f
6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents:
8769
diff
changeset
|
375 |
$(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
|
376 |
@$(RM) $@ $@.temp1 $@.temp2 |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
377 |
@(($(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
|
378 |
($(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
|
379 |
($(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
|
380 |
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_VERSION)') ;\ |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
381 |
($(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
|
382 |
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH2)' ) ;\ |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
383 |
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-all' ) ;\ |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
384 |
($(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
|
385 |
) | $(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
|
386 |
| $(EGREP) -v '^#' > $@.temp1 |
15656
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
387 |
@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
|
388 |
( ( $(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
|
389 |
done |
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) "# 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
|
391 |
@( $(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
|
392 |
@$(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
|
393 |
endif |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
394 |
|
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
395 |
# Select list of directories that exist |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
396 |
define TestDirs |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
397 |
$(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
|
398 |
endef |
10607
1ba66093449c
7092627: use agentvm mode instead of samevm in regtests
weijun
parents:
10435
diff
changeset
|
399 |
# Running batches of tests with or without agentvm |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
400 |
define RunBatch |
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
401 |
$(ECHO) "Running tests: $?" |
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
402 |
$(MAKE) TEST_DEPENDENCIES="$?" TESTDIRS="$?" 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
|
403 |
endef |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
404 |
define SummaryInfo |
4514 | 405 |
$(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
|
406 |
$(CAT) $(?:%=$(ABS_TEST_OUTPUT_DIR)/%/$(STATS_TXT_NAME)) |
4514 | 407 |
$(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
|
408 |
endef |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
409 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
410 |
# ------------------------------------------------------------------ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
411 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
412 |
# Batches of tests (somewhat arbitrary assigments to jdk_* targets) |
15656
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
413 |
# NOTE: These *do not* run the same tests as make/jprt.properties |
11281 | 414 |
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
|
415 |
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
|
416 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
417 |
JDK_ALL_TARGETS += jdk_awt |
10435 | 418 |
jdk_awt: $(call TestDirs, com/sun/awt java/awt sun/awt \ |
419 |
javax/imageio javax/print sun/pisces) |
|
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
420 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
421 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
422 |
JDK_ALL_TARGETS += jdk_beans1 |
11281 | 423 |
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
|
424 |
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
|
425 |
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
|
426 |
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
|
427 |
java/beans/VetoableChangeSupport java/beans/Statement) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
428 |
$(call RunBatch) |
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 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
430 |
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
|
431 |
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
|
432 |
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
|
433 |
java/beans/PropertyEditor) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
434 |
$(call RunBatch) |
4514 | 435 |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
436 |
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
|
437 |
jdk_beans3: $(call TestDirs, java/beans/XMLEncoder) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
438 |
$(call RunBatch) |
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 |
|
4514 | 440 |
# All beans tests |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
441 |
jdk_beans: jdk_beans1 jdk_beans2 jdk_beans3 |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
442 |
@$(SummaryInfo) |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
443 |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
444 |
JDK_ALL_TARGETS += jdk_io |
11281 | 445 |
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
|
446 |
jdk_io: $(call TestDirs, java/io) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
447 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
448 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
449 |
JDK_ALL_TARGETS += jdk_lang |
11281 | 450 |
JDK_DEFAULT_TARGETS += jdk_lang |
16906
44dfee24cb71
8010117: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive
mchung
parents:
16901
diff
changeset
|
451 |
jdk_lang: $(call TestDirs, java/lang sun/invoke sun/misc sun/reflect vm) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
452 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
453 |
|
14170
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
454 |
JDK_ALL_TARGETS += jdk_jmx |
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
455 |
jdk_jmx: $(call TestDirs, javax/management com/sun/jmx) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
456 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
457 |
|
14170
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
458 |
JDK_ALL_TARGETS += jdk_management |
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
459 |
jdk_management: $(call TestDirs, com/sun/management sun/management) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
460 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
461 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
462 |
JDK_ALL_TARGETS += jdk_math |
11281 | 463 |
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
|
464 |
jdk_math: $(call TestDirs, java/math) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
465 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
466 |
|
15289 | 467 |
JDK_DEFAULT_TARGETS += jdk_time |
468 |
jdk_time: $(call TestDirs, java/time) |
|
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
469 |
$(call RunBatch) |
15289 | 470 |
|
14170
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
471 |
JDK_ALL_TARGETS += jdk_other |
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
472 |
JDK_DEFAULT_TARGETS += jdk_other |
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
473 |
jdk_other: $(call TestDirs, \ |
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
474 |
demo/jvmti demo/zipfs sample \ |
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
475 |
javax/naming com/sun/jndi \ |
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
476 |
javax/script \ |
14777 | 477 |
java/sql javax/sql \ |
14170
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
478 |
javax/smartcardio \ |
16894 | 479 |
javax/xml/jaxp \ |
16104
234ab73a1830
8004302: javax/xml/soap/Test7013971.java fails since jdk6u39b01
mullan
parents:
15289
diff
changeset
|
480 |
javax/xml/soap \ |
16893 | 481 |
javax/xml/ws com/sun/internal/ws com/sun/org/glassfish \ |
14198
071fd6fd257d
7197401: Add a subset of the org.objectweb.asm packages to jdk8
jjh
parents:
14170
diff
changeset
|
482 |
jdk/asm \ |
17442
1444a769a68a
8012664: Add tests for java.util.stream and lambda translation
briangoetz
parents:
17155
diff
changeset
|
483 |
jdk/lambda \ |
14170
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
484 |
com/sun/org/apache/xerces \ |
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
485 |
com/sun/corba \ |
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
486 |
com/sun/tracing \ |
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
487 |
sun/usagetracker) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
488 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
489 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
490 |
JDK_ALL_TARGETS += jdk_net |
11281 | 491 |
JDK_DEFAULT_TARGETS += jdk_net |
14170
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
492 |
jdk_net: $(call TestDirs, com/sun/net java/net sun/net com/oracle/net) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
493 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
494 |
|
14170
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
495 |
jdk_nio: $(call TestDirs, java/nio sun/nio com/oracle/nio) |
5611
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
496 |
$(call SharedLibraryPermissions,java/nio/channels) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
497 |
$(call RunBatch) |
4514 | 498 |
|
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
|
499 |
jdk_sctp: $(call TestDirs, com/sun/nio/sctp) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
500 |
$(call RunBatch) |
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
|
501 |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
502 |
JDK_ALL_TARGETS += jdk_rmi |
14170
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
503 |
jdk_rmi: $(call TestDirs, java/rmi sun/rmi javax/rmi/ssl) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
504 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
505 |
|
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_security1 |
11281 | 507 |
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
|
508 |
jdk_security1: $(call TestDirs, java/security) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
509 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
510 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
511 |
JDK_ALL_TARGETS += jdk_security2 |
10416 | 512 |
jdk_security2: $(call TestDirs, javax/crypto javax/xml/crypto com/sun/crypto) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
513 |
$(call RunBatch) |
4514 | 514 |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
515 |
JDK_ALL_TARGETS += jdk_security3 |
10435 | 516 |
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
|
517 |
sun/security com/sun/org/apache/xml/internal/security \ |
14170
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
518 |
com/oracle/security) |
5611
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
519 |
$(call SharedLibraryPermissions,sun/security) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
520 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
521 |
|
4514 | 522 |
# All security tests |
4329
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
523 |
jdk_security: jdk_security1 jdk_security2 jdk_security3 |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
524 |
@$(SummaryInfo) |
850b656a411e
6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents:
4187
diff
changeset
|
525 |
|
10435 | 526 |
JDK_ALL_TARGETS += jdk_sound |
527 |
jdk_sound: $(call TestDirs, javax/sound) |
|
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
528 |
$(call RunBatch) |
10435 | 529 |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
530 |
JDK_ALL_TARGETS += jdk_swing |
10435 | 531 |
jdk_swing: $(call TestDirs, javax/swing sun/java2d \ |
532 |
demo/jfc com/sun/java/swing) |
|
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
533 |
$(call RunBatch) |
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 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
535 |
JDK_ALL_TARGETS += jdk_text |
11281 | 536 |
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
|
537 |
jdk_text: $(call TestDirs, java/text sun/text) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
538 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
539 |
|
14170
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
540 |
JDK_ALL_TARGETS += jdk_jdi |
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
541 |
jdk_jdi: $(call TestDirs, com/sun/jdi) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
542 |
$(call RunBatch) |
4514 | 543 |
|
14170
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
544 |
JDK_ALL_TARGETS += jdk_tools |
c819974fc133
7173494: some jdk tests are not run in test/Makefile
alanb
parents:
13569
diff
changeset
|
545 |
jdk_tools: $(call TestDirs, com/sun/tools sun/jvmstat sun/tools tools) |
5611
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
546 |
$(call SharedLibraryPermissions,tools/launcher) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
547 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
548 |
|
12887 | 549 |
ifdef OPENJDK |
550 |
jdk_jfr: |
|
551 |
else |
|
552 |
JDK_ALL_TARGETS += jdk_jfr |
|
553 |
jdk_jfr: $(call TestDirs, com/oracle/jfr) |
|
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
554 |
$(call RunBatch) |
12887 | 555 |
endif |
556 |
||
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
557 |
JDK_ALL_TARGETS += jdk_util |
11281 | 558 |
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
|
559 |
jdk_util: $(call TestDirs, java/util sun/util) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
560 |
$(call RunBatch) |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
561 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
562 |
# ------------------------------------------------------------------ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
563 |
|
11281 | 564 |
# Run default tests |
15656
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
565 |
# note that this *does not* have the same meaning as jprt.properties :: jprt.make.rule.default.test.targets |
11281 | 566 |
jdk_default: $(JDK_DEFAULT_TARGETS) |
567 |
@$(SummaryInfo) |
|
568 |
||
15656
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
569 |
# Run core tests |
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
570 |
# please keep this in sync with jdk/make/jprt.properties :: jprt.make.rule.core.test.targets |
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
571 |
jdk_core: jdk_lang jdk_math jdk_util jdk_io jdk_net jdk_nio \ |
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
572 |
jdk_security1 jdk_security2 jdk_security3 jdk_rmi \ |
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
573 |
jdk_management jdk_jmx jdk_text jdk_tools jdk_jfr jdk_other |
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
574 |
@$(SummaryInfo) |
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
575 |
|
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
576 |
# Run all tests |
15656
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
577 |
# note that this *does not* have the same meaning as jprt.properties :: jprt.make.rule.all.test.targets |
11281 | 578 |
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
|
579 |
@$(SummaryInfo) |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
580 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
581 |
# These are all phony targets |
15656
374433993cb0
8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents:
15289
diff
changeset
|
582 |
PHONY_LIST += $(JDK_ALL_TARGETS) jdk_default jdk_core jdk_all |
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 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
584 |
# ------------------------------------------------------------------ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
585 |
|
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
586 |
ifdef CONCURRENCY |
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
587 |
EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY) |
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
588 |
endif |
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
589 |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
590 |
# 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
|
591 |
JTREG = $(JT_HOME)/win32/bin/jtreg |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
592 |
# run in agentvm mode |
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
593 |
JTREG_BASIC_OPTIONS += -agentvm |
4187
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
594 |
# 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
|
595 |
JTREG_BASIC_OPTIONS += -a |
4517
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
596 |
# Always turn on assertions |
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
597 |
JTREG_ASSERT_OPTION = -ea -esa |
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
598 |
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
|
599 |
# 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
|
600 |
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
|
601 |
# 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
|
602 |
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
|
603 |
# 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
|
604 |
JTREG_IGNORE_OPTION = -ignore:quiet |
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
605 |
JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION) |
4514 | 606 |
# Multiple by 4 the timeout numbers |
4517
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
607 |
JTREG_TIMEOUT_OPTION = -timeoutFactor:4 |
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
608 |
JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) |
17705 | 609 |
# Set the max memory for jtreg control vm |
4517
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
610 |
JTREG_MEMORY_OPTION = -J-Xmx512m |
48e5b69c7e27
6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents:
4514
diff
changeset
|
611 |
JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) |
19063
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
612 |
# Add any extra options |
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
613 |
JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
614 |
# Set other vm and test options |
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
615 |
JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
616 |
# Set the GC options for test vms |
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
617 |
#JTREG_GC_OPTION = -vmoption:-XX:+UseSerialGC |
0aa7087394a1
8021588: Remove explicit othervm execution from jdk/test/Makefile
mduigou
parents:
17705
diff
changeset
|
618 |
#JTREG_TEST_OPTIONS += $(JTREG_GC_OPTION) |
17705 | 619 |
# Set the max memory for jtreg target test vms |
620 |
JTREG_TESTVM_MEMORY_OPTION = -vmoption:-Xmx512m |
|
621 |
JTREG_TEST_OPTIONS += $(JTREG_TESTVM_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
|
622 |
|
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 |
# 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
|
624 |
$(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
|
625 |
|
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
626 |
# 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
|
627 |
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
|
628 |
@$(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
|
629 |
| $(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
|
630 |
| $(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
|
631 |
( \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
632 |
( 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
|
633 |
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
|
634 |
$(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
|
635 |
$(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
|
636 |
-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
|
637 |
-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
|
638 |
-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
|
639 |
-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
|
640 |
$(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
|
641 |
$(TESTDIRS) \ |
d7111a88f0ec
6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents:
2945
diff
changeset
|
642 |
) ; $(BUNDLE_UP_AND_EXIT) \ |
4342
9f3aa1172803
6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents:
4335
diff
changeset
|
643 |
) 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
|
644 |
|
5611
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
645 |
# 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
|
646 |
# 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
|
647 |
# 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
|
648 |
# 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
|
649 |
# 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
|
650 |
# 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
|
651 |
# 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
|
652 |
# 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
|
653 |
# 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
|
654 |
# 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
|
655 |
# 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
|
656 |
# 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
|
657 |
# |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
658 |
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
|
659 |
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
|
660 |
$(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
|
661 |
-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
|
662 |
fi |
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
663 |
|
b4ef86f105ec
6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents:
5600
diff
changeset
|
664 |
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
|
665 |
|
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
666 |
################################################################ |
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
667 |
|
2 | 668 |
# 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
|
669 |
.PHONY: all clean prep $(PHONY_LIST) |
2 | 670 |
|
2400
0d7007d99b0f
6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents:
2
diff
changeset
|
671 |
################################################################ |