jdk/test/Makefile
author yhuang
Wed, 17 Apr 2013 01:04:45 -0700
changeset 16908 c8a0f2183fed
parent 16906 44dfee24cb71
child 17155 69080fe3eb45
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     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
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5149
diff changeset
     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
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5149
diff changeset
     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
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5149
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5149
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5149
diff changeset
    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
90ce3da70b43 Initial load
duke
parents:
diff changeset
    28
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
    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
90ce3da70b43 Initial load
duke
parents:
diff changeset
    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
90ce3da70b43 Initial load
duke
parents:
diff changeset
   110
  endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   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
90ce3da70b43 Initial load
duke
parents:
diff changeset
   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
90ce3da70b43 Initial load
duke
parents:
diff changeset
   196
endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   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
90ce3da70b43 Initial load
duke
parents:
diff changeset
   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
90ce3da70b43 Initial load
duke
parents:
diff changeset
   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
90ce3da70b43 Initial load
duke
parents:
diff changeset
   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
90ce3da70b43 Initial load
duke
parents:
diff changeset
   235
endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   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
90ce3da70b43 Initial load
duke
parents:
diff changeset
   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
90ce3da70b43 Initial load
duke
parents:
diff changeset
   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
7758bdd54629 6906210: Fix another minor typo in test/Makefile
ohair
parents: 4342
diff changeset
   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
7758bdd54629 6906210: Fix another minor typo in test/Makefile
ohair
parents: 4342
diff changeset
   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
90ce3da70b43 Initial load
duke
parents:
diff changeset
   333
11281
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   334
# Default make rule (runs default jdk tests)
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   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
90ce3da70b43 Initial load
duke
parents:
diff changeset
   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
90ce3da70b43 Initial load
duke
parents:
diff changeset
   342
90ce3da70b43 Initial load
duke
parents:
diff changeset
   343
# Cleanup
90ce3da70b43 Initial load
duke
parents:
diff changeset
   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
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   365
# Agentvm settings (default is false)
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   366
ifndef USE_JTREG_AGENTVM
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   367
  USE_JTREG_AGENTVM=false
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   368
endif
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   369
# With agentvm, you cannot use -javaoptions?
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   370
ifeq ($(USE_JTREG_AGENTVM),true)
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   371
  JTREG_AGENTVM_OPTION = -agentvm
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   372
  EXTRA_JTREG_OPTIONS += $(JTREG_AGENTVM_OPTION) $(JAVA_ARGS) $(JAVA_ARGS:%=-vmoption:%)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   373
  JTREG_TEST_OPTIONS = $(JAVA_VM_ARGS:%=-vmoption:%)
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   374
else
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   375
  JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   376
endif
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   377
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   378
ifdef CONCURRENCY
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   379
  EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   380
endif
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   381
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   382
# Some tests annoy me and fail frequently
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   383
PROBLEM_LIST=ProblemList.txt
4329
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   384
PROBLEM_LISTS=$(PROBLEM_LIST) $(wildcard closed/$(PROBLEM_LIST))
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   385
EXCLUDELIST=$(ABS_TEST_OUTPUT_DIR)/excludelist.txt
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   386
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   387
# Create exclude list for this platform and arch
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   388
ifdef NO_EXCLUDES
8992
6a3062c1416f 6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents: 8769
diff changeset
   389
$(EXCLUDELIST): $(PROBLEM_LISTS) $(TEST_DEPENDENCIES)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   390
	@$(ECHO) "NOTHING_EXCLUDED" > $@
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   391
else
8992
6a3062c1416f 6737397: Should support running JCK test suite with test/Makefile and JPRT
ohair
parents: 8769
diff changeset
   392
$(EXCLUDELIST): $(PROBLEM_LISTS) $(TEST_DEPENDENCIES)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   393
	@$(RM) $@ $@.temp1 $@.temp2
4329
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   394
	@(($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-all'          ) ;\
5813
8e455cd3e807 6962617: Testcase changes, cleanup of problem list for jdk_tools targets
ohair
parents: 5627
diff changeset
   395
	  ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(PLATFORM_OS)'          ) ;\
5149
efce9634bfc0 6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents: 4991
diff changeset
   396
	  ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH2)'  ) ;\
4329
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   397
	  ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_VERSION)') ;\
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   398
	  ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH)'      ) ;\
5149
efce9634bfc0 6933294: Fix some test/Makefile issues around Linux ARCH settings, better defaults
ohair
parents: 4991
diff changeset
   399
	  ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH2)'     ) ;\
4329
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   400
          ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-all'             ) ;\
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   401
          ($(ECHO) "#") ;\
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   402
        ) | $(SED) -e 's@^[\ ]*@@' \
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   403
          | $(EGREP) -v '^#' > $@.temp1
15656
374433993cb0 8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents: 15289
diff changeset
   404
	@for tdir in $(TESTDIRS) SOLARIS_10_SH_BUG_NO_EMPTY_FORS ; do \
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   405
          ( ( $(CAT) $@.temp1 | $(EGREP) "^$${tdir}" ) ; $(ECHO) "#" ) >> $@.temp2 ; \
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   406
        done
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   407
	@$(ECHO) "# at least one line" >> $@.temp2
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   408
	@( $(EGREP) -v '^#' $@.temp2 ; true ) > $@
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   409
	@$(ECHO) "Excluding list contains `$(EXPAND) $@ | $(WC) -l` items"
2400
0d7007d99b0f 6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents: 2
diff changeset
   410
endif
0d7007d99b0f 6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents: 2
diff changeset
   411
4329
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   412
# Select list of directories that exist
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   413
define TestDirs
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   414
$(foreach i,$1,$(wildcard ${i})) $(foreach i,$1,$(wildcard closed/${i}))
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   415
endef
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   416
# Running batches of tests with or without agentvm
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   417
define RunAgentvmBatch
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   418
$(ECHO) "Running tests in agentvm mode: $?"
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   419
$(MAKE) TEST_DEPENDENCIES="$?" TESTDIRS="$?" USE_JTREG_AGENTVM=true  UNIQUE_DIR=$@ jtreg_tests
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   420
endef
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   421
define RunOthervmBatch
8769
728aa3db9869 7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
ramap
parents: 5970
diff changeset
   422
$(ECHO) "Running tests in othervm mode: $?"
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   423
$(MAKE) TEST_DEPENDENCIES="$?" TESTDIRS="$?" USE_JTREG_AGENTVM=false UNIQUE_DIR=$@ jtreg_tests
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   424
endef
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   425
define SummaryInfo
4514
7758bdd54629 6906210: Fix another minor typo in test/Makefile
ohair
parents: 4342
diff changeset
   426
$(ECHO) "########################################################"
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   427
$(CAT) $(?:%=$(ABS_TEST_OUTPUT_DIR)/%/$(STATS_TXT_NAME))
4514
7758bdd54629 6906210: Fix another minor typo in test/Makefile
ohair
parents: 4342
diff changeset
   428
$(ECHO) "########################################################"
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   429
endef
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   430
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   431
# ------------------------------------------------------------------
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   432
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   433
# Batches of tests (somewhat arbitrary assigments to jdk_* targets)
15656
374433993cb0 8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents: 15289
diff changeset
   434
# NOTE: These *do not* run the same tests as make/jprt.properties
11281
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   435
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
   436
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
   437
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   438
# Stable othervm testruns (minus items from PROBLEM_LIST)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   439
#   Using agentvm has problems, and doesn't help performance as much as others.
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   440
JDK_ALL_TARGETS += jdk_awt
10435
e9df9d264894 7087428: move client tests out of jdk_misc
weijun
parents: 10416
diff changeset
   441
jdk_awt: $(call TestDirs, com/sun/awt java/awt sun/awt \
e9df9d264894 7087428: move client tests out of jdk_misc
weijun
parents: 10416
diff changeset
   442
         javax/imageio javax/print sun/pisces)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   443
	$(call RunOthervmBatch)
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   444
11910
5ebe67376f05 7147087: Remove AWT/Swing/client tests from ProblemList
alanb
parents: 11840
diff changeset
   445
# Stable othervm testruns (minus items from PROBLEM_LIST)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   446
JDK_ALL_TARGETS += jdk_beans1
11281
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   447
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
   448
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
   449
            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
   450
            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
   451
            java/beans/VetoableChangeSupport java/beans/Statement)
11910
5ebe67376f05 7147087: Remove AWT/Swing/client tests from ProblemList
alanb
parents: 11840
diff changeset
   452
	$(call RunOthervmBatch)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   453
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   454
# Stable othervm testruns (minus items from PROBLEM_LIST)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   455
#   Using agentvm has serious problems with these tests
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   456
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
   457
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
   458
            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
   459
            java/beans/PropertyEditor)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   460
	$(call RunOthervmBatch)
4514
7758bdd54629 6906210: Fix another minor typo in test/Makefile
ohair
parents: 4342
diff changeset
   461
7758bdd54629 6906210: Fix another minor typo in test/Makefile
ohair
parents: 4342
diff changeset
   462
# Stable othervm testruns (minus items from PROBLEM_LIST)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   463
#   Using agentvm has serious problems with these tests
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   464
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
   465
jdk_beans3: $(call TestDirs, java/beans/XMLEncoder)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   466
	$(call RunOthervmBatch)
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   467
4514
7758bdd54629 6906210: Fix another minor typo in test/Makefile
ohair
parents: 4342
diff changeset
   468
# All beans tests
4329
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   469
jdk_beans: jdk_beans1 jdk_beans2 jdk_beans3
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   470
	@$(SummaryInfo)
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   471
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   472
# Stable agentvm testruns (minus items from PROBLEM_LIST)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   473
JDK_ALL_TARGETS += jdk_io
11281
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   474
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
   475
jdk_io: $(call TestDirs, java/io)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   476
	$(call RunAgentvmBatch)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   477
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   478
# Stable agentvm testruns (minus items from PROBLEM_LIST)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   479
JDK_ALL_TARGETS += jdk_lang
11281
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   480
JDK_DEFAULT_TARGETS += jdk_lang
16906
44dfee24cb71 8010117: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive
mchung
parents: 16901
diff changeset
   481
jdk_lang: $(call TestDirs, java/lang sun/invoke sun/misc sun/reflect vm)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   482
	$(call RunAgentvmBatch)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   483
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   484
# Stable othervm testruns (minus items from PROBLEM_LIST)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   485
#   Using agentvm has serious problems with these tests
14170
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   486
JDK_ALL_TARGETS += jdk_jmx
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   487
jdk_jmx: $(call TestDirs, javax/management com/sun/jmx)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   488
	$(call RunOthervmBatch)
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   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
# Stable othervm testruns (minus items from PROBLEM_LIST)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   491
#   Using agentvm has serious problems with these tests
14170
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   492
JDK_ALL_TARGETS += jdk_management
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   493
jdk_management: $(call TestDirs, com/sun/management sun/management)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   494
	$(call RunOthervmBatch)
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   495
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   496
# Stable agentvm testruns (minus items from PROBLEM_LIST)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   497
JDK_ALL_TARGETS += jdk_math
11281
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   498
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
   499
jdk_math: $(call TestDirs, java/math)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   500
	$(call RunAgentvmBatch)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   501
15289
3ac550392e43 8003680: JSR 310 Date/Time API
sherman
parents: 14777
diff changeset
   502
# Stable agentvm testruns (TestNG)
3ac550392e43 8003680: JSR 310 Date/Time API
sherman
parents: 14777
diff changeset
   503
JDK_DEFAULT_TARGETS += jdk_time
3ac550392e43 8003680: JSR 310 Date/Time API
sherman
parents: 14777
diff changeset
   504
jdk_time: $(call TestDirs, java/time)
3ac550392e43 8003680: JSR 310 Date/Time API
sherman
parents: 14777
diff changeset
   505
	$(call RunOthervmBatch)
3ac550392e43 8003680: JSR 310 Date/Time API
sherman
parents: 14777
diff changeset
   506
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   507
# Stable agentvm testruns (minus items from PROBLEM_LIST)
14170
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   508
JDK_ALL_TARGETS += jdk_other
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   509
JDK_DEFAULT_TARGETS += jdk_other
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   510
jdk_other: $(call TestDirs, \
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   511
          demo/jvmti demo/zipfs sample \
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   512
          javax/naming com/sun/jndi \
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   513
          javax/script \
14777
62a7f77b65c8 8004337: java/sql tests aren't run in test/Makefile
robm
parents: 14198
diff changeset
   514
	  java/sql javax/sql \
14170
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   515
          javax/smartcardio \
16894
2cbed903304a 6657673: Issues with JAXP
joehw
parents: 16893
diff changeset
   516
          javax/xml/jaxp \
16104
234ab73a1830 8004302: javax/xml/soap/Test7013971.java fails since jdk6u39b01
mullan
parents: 15289
diff changeset
   517
	  javax/xml/soap \
16893
5bed2c2c97dc 8003445: Adjust JAX-WS to focus on API
mullan
parents: 16115
diff changeset
   518
	  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
   519
	  jdk/asm \
14170
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   520
	  com/sun/org/apache/xerces \
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   521
          com/sun/corba \
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   522
	  com/sun/tracing \
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   523
	  sun/usagetracker)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   524
	$(call RunAgentvmBatch)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   525
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   526
# Stable agentvm testruns (minus items from PROBLEM_LIST)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   527
JDK_ALL_TARGETS += jdk_net
11281
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   528
JDK_DEFAULT_TARGETS += jdk_net
14170
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   529
jdk_net: $(call TestDirs, com/sun/net java/net sun/net com/oracle/net)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   530
	$(call RunAgentvmBatch)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   531
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   532
# Stable agentvm testruns (minus items from PROBLEM_LIST)
14170
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   533
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
   534
	$(call SharedLibraryPermissions,java/nio/channels)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   535
	$(call RunAgentvmBatch)
4514
7758bdd54629 6906210: Fix another minor typo in test/Makefile
ohair
parents: 4342
diff changeset
   536
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   537
# Stable agentvm testruns (minus items from PROBLEM_LIST)
10064
9f56d9f43ec1 7057935: com/sun/nio/sctp tests should be moved out of jdk_nio and into their own target, jdk_sctp
chegar
parents: 10061
diff changeset
   538
jdk_sctp: $(call TestDirs, com/sun/nio/sctp)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   539
	$(call RunAgentvmBatch)
10064
9f56d9f43ec1 7057935: com/sun/nio/sctp tests should be moved out of jdk_nio and into their own target, jdk_sctp
chegar
parents: 10061
diff changeset
   540
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   541
# Stable othervm testruns (minus items from PROBLEM_LIST)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   542
#   Using agentvm has serious problems with these tests
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   543
JDK_ALL_TARGETS += jdk_rmi
14170
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   544
jdk_rmi: $(call TestDirs, java/rmi sun/rmi javax/rmi/ssl)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   545
	$(call RunOthervmBatch)
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   546
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   547
# Stable agentvm testruns (minus items from PROBLEM_LIST)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   548
JDK_ALL_TARGETS += jdk_security1
11281
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   549
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
   550
jdk_security1: $(call TestDirs, java/security)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   551
	$(call RunAgentvmBatch)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   552
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   553
# Stable agentvm testruns (minus items from PROBLEM_LIST)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   554
JDK_ALL_TARGETS += jdk_security2
10416
61d6ccadbfa2 7083576: add javax/xml/crypto into jdk_security2
weijun
parents: 10328
diff changeset
   555
jdk_security2: $(call TestDirs, javax/crypto javax/xml/crypto com/sun/crypto)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   556
	$(call RunAgentvmBatch)
4514
7758bdd54629 6906210: Fix another minor typo in test/Makefile
ohair
parents: 4342
diff changeset
   557
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   558
# Stable agentvm testruns (minus items from PROBLEM_LIST)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   559
JDK_ALL_TARGETS += jdk_security3
10435
e9df9d264894 7087428: move client tests out of jdk_misc
weijun
parents: 10416
diff changeset
   560
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
   561
        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
   562
        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
   563
	$(call SharedLibraryPermissions,sun/security)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   564
	$(call RunAgentvmBatch)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   565
4514
7758bdd54629 6906210: Fix another minor typo in test/Makefile
ohair
parents: 4342
diff changeset
   566
# All security tests
4329
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   567
jdk_security: jdk_security1 jdk_security2 jdk_security3
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   568
	@$(SummaryInfo)
850b656a411e 6902666: Include closed tests in the test/Makefile jdk_* targets
ohair
parents: 4187
diff changeset
   569
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   570
# Stable agentvm testruns (minus items from PROBLEM_LIST)
10435
e9df9d264894 7087428: move client tests out of jdk_misc
weijun
parents: 10416
diff changeset
   571
JDK_ALL_TARGETS += jdk_sound
e9df9d264894 7087428: move client tests out of jdk_misc
weijun
parents: 10416
diff changeset
   572
jdk_sound: $(call TestDirs, javax/sound)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   573
	$(call RunAgentvmBatch)
10435
e9df9d264894 7087428: move client tests out of jdk_misc
weijun
parents: 10416
diff changeset
   574
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   575
# Stable othervm testruns (minus items from PROBLEM_LIST)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   576
#   Using agentvm has problems, and doesn't help performance as much as others.
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   577
JDK_ALL_TARGETS += jdk_swing
10435
e9df9d264894 7087428: move client tests out of jdk_misc
weijun
parents: 10416
diff changeset
   578
jdk_swing: $(call TestDirs, javax/swing sun/java2d \
e9df9d264894 7087428: move client tests out of jdk_misc
weijun
parents: 10416
diff changeset
   579
           demo/jfc com/sun/java/swing)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   580
	$(call RunOthervmBatch)
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   581
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   582
# Stable agentvm testruns (minus items from PROBLEM_LIST)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   583
JDK_ALL_TARGETS += jdk_text
11281
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   584
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
   585
jdk_text: $(call TestDirs, java/text sun/text)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   586
	$(call RunAgentvmBatch)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   587
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   588
# Stable agentvm testruns (minus items from PROBLEM_LIST)
14170
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   589
JDK_ALL_TARGETS += jdk_jdi
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   590
jdk_jdi: $(call TestDirs, com/sun/jdi)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   591
	$(call RunAgentvmBatch)
4514
7758bdd54629 6906210: Fix another minor typo in test/Makefile
ohair
parents: 4342
diff changeset
   592
7758bdd54629 6906210: Fix another minor typo in test/Makefile
ohair
parents: 4342
diff changeset
   593
# Stable othervm testruns (minus items from PROBLEM_LIST)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   594
#   Using agentvm has serious problems with these tests
14170
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   595
JDK_ALL_TARGETS += jdk_tools
c819974fc133 7173494: some jdk tests are not run in test/Makefile
alanb
parents: 13569
diff changeset
   596
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
   597
	$(call SharedLibraryPermissions,tools/launcher)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   598
	$(call RunAgentvmBatch)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   599
12887
582f5a8047e9 7165257: Add JFR tests to the JDK code base
sla
parents: 12047
diff changeset
   600
# Stable othervm testruns (minus items from PROBLEM_LIST)
582f5a8047e9 7165257: Add JFR tests to the JDK code base
sla
parents: 12047
diff changeset
   601
#   Using agentvm has serious problems with these tests
582f5a8047e9 7165257: Add JFR tests to the JDK code base
sla
parents: 12047
diff changeset
   602
ifdef OPENJDK
582f5a8047e9 7165257: Add JFR tests to the JDK code base
sla
parents: 12047
diff changeset
   603
jdk_jfr:
582f5a8047e9 7165257: Add JFR tests to the JDK code base
sla
parents: 12047
diff changeset
   604
else
582f5a8047e9 7165257: Add JFR tests to the JDK code base
sla
parents: 12047
diff changeset
   605
JDK_ALL_TARGETS += jdk_jfr
582f5a8047e9 7165257: Add JFR tests to the JDK code base
sla
parents: 12047
diff changeset
   606
jdk_jfr: $(call TestDirs, com/oracle/jfr)
582f5a8047e9 7165257: Add JFR tests to the JDK code base
sla
parents: 12047
diff changeset
   607
	$(call RunOthervmBatch)
582f5a8047e9 7165257: Add JFR tests to the JDK code base
sla
parents: 12047
diff changeset
   608
endif
582f5a8047e9 7165257: Add JFR tests to the JDK code base
sla
parents: 12047
diff changeset
   609
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   610
# Stable agentvm testruns (minus items from PROBLEM_LIST)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   611
JDK_ALL_TARGETS += jdk_util
11281
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   612
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
   613
jdk_util: $(call TestDirs, java/util sun/util)
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   614
	$(call RunAgentvmBatch)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   615
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   616
# ------------------------------------------------------------------
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   617
11281
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   618
# Run default tests
15656
374433993cb0 8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents: 15289
diff changeset
   619
# note that this *does not* have the same meaning as jprt.properties :: jprt.make.rule.default.test.targets
11281
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   620
jdk_default: $(JDK_DEFAULT_TARGETS)
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   621
	@$(SummaryInfo)
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   622
15656
374433993cb0 8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents: 15289
diff changeset
   623
# Run core tests
374433993cb0 8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents: 15289
diff changeset
   624
# 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
   625
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
   626
        jdk_security1 jdk_security2 jdk_security3 jdk_rmi \
374433993cb0 8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents: 15289
diff changeset
   627
        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
   628
	@$(SummaryInfo)
374433993cb0 8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents: 15289
diff changeset
   629
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   630
# Run all tests
15656
374433993cb0 8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents: 15289
diff changeset
   631
# note that this *does not* have the same meaning as jprt.properties :: jprt.make.rule.all.test.targets
11281
58ecbc808474 7119829: Adjust default jprt testing configuration
ohair
parents: 10607
diff changeset
   632
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
   633
	@$(SummaryInfo)
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   634
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   635
# These are all phony targets
15656
374433993cb0 8006594: Add jdk_core target to jdk/test/Makefile
mduigou
parents: 15289
diff changeset
   636
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
   637
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   638
# ------------------------------------------------------------------
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   639
2400
0d7007d99b0f 6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents: 2
diff changeset
   640
# 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
   641
JTREG = $(JT_HOME)/win32/bin/jtreg
10607
1ba66093449c 7092627: use agentvm mode instead of samevm in regtests
weijun
parents: 10435
diff changeset
   642
# Add any extra options (agentvm etc.)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   643
JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   644
# 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
   645
JTREG_BASIC_OPTIONS += -a
4517
48e5b69c7e27 6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents: 4514
diff changeset
   646
# Always turn on assertions
48e5b69c7e27 6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents: 4514
diff changeset
   647
JTREG_ASSERT_OPTION = -ea -esa
48e5b69c7e27 6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents: 4514
diff changeset
   648
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
   649
# 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
   650
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
   651
# 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
   652
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
   653
# 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
   654
JTREG_IGNORE_OPTION = -ignore:quiet
48e5b69c7e27 6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents: 4514
diff changeset
   655
JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION)
4514
7758bdd54629 6906210: Fix another minor typo in test/Makefile
ohair
parents: 4342
diff changeset
   656
# Multiple by 4 the timeout numbers
4517
48e5b69c7e27 6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents: 4514
diff changeset
   657
JTREG_TIMEOUT_OPTION =  -timeoutFactor:4
48e5b69c7e27 6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents: 4514
diff changeset
   658
JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   659
# Boost the max memory for jtreg to avoid gc thrashing
4517
48e5b69c7e27 6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents: 4514
diff changeset
   660
JTREG_MEMORY_OPTION = -J-Xmx512m
48e5b69c7e27 6909373: Add -ea to the testing done by jdk/test/Makefile
ohair
parents: 4514
diff changeset
   661
JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION)
2400
0d7007d99b0f 6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents: 2
diff changeset
   662
4187
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   663
# 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
   664
$(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
   665
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   666
# 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
   667
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
   668
	@$(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
   669
            | $(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
   670
            | $(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
   671
	(                                                                    \
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   672
	  ( 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
   673
            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
   674
            $(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
   675
              $(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
   676
              -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
   677
              -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
   678
              -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
   679
              -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
   680
              $(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
   681
              $(TESTDIRS)                                                    \
d7111a88f0ec 6888927: Fix jdk jtreg tests to indicate which ones need othervm, allow for use of samevm option
ohair
parents: 2945
diff changeset
   682
	  ) ; $(BUNDLE_UP_AND_EXIT)                                          \
4342
9f3aa1172803 6905705: Fix broken exit code values in jdk/test/Makefile
ohair
parents: 4335
diff changeset
   683
	) 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
   684
5611
b4ef86f105ec 6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents: 5600
diff changeset
   685
# 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
   686
#  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
   687
#  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
   688
#  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
   689
#  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
   690
#  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
   691
#  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
   692
#  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
   693
#  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
   694
#  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
   695
#  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
   696
#  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
   697
#
b4ef86f105ec 6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents: 5600
diff changeset
   698
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
   699
	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
   700
	  $(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
   701
	        -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
   702
        fi
b4ef86f105ec 6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents: 5600
diff changeset
   703
b4ef86f105ec 6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
ohair
parents: 5600
diff changeset
   704
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
   705
0d7007d99b0f 6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents: 2
diff changeset
   706
################################################################
0d7007d99b0f 6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents: 2
diff changeset
   707
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   708
# 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
   709
.PHONY: all clean prep $(PHONY_LIST)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   710
2400
0d7007d99b0f 6502548: test/Makefile needs to be setup to allow for JPRT testrules (NSK and JCK testing too?)
ohair
parents: 2
diff changeset
   711
################################################################