equal
deleted
inserted
replaced
31 # Default values for some properties that can be overridden by components. |
31 # Default values for some properties that can be overridden by components. |
32 USE_JTREG_VERSION ?= 4.2 |
32 USE_JTREG_VERSION ?= 4.2 |
33 JTREG_VM_TYPE ?= -agentvm |
33 JTREG_VM_TYPE ?= -agentvm |
34 USE_JTREG_ASSERT ?= true |
34 USE_JTREG_ASSERT ?= true |
35 LIMIT_JTREG_VM_MEMORY ?= true |
35 LIMIT_JTREG_VM_MEMORY ?= true |
|
36 |
|
37 X:= |
|
38 SPACE:=$(X) $(X) |
36 |
39 |
37 .DEFAULT : all |
40 .DEFAULT : all |
38 |
41 |
39 # Empty these to get rid of some default rules |
42 # Empty these to get rid of some default rules |
40 .SUFFIXES: |
43 .SUFFIXES: |
85 ifeq ($(findstring BSD,$(UNAME_S)), BSD) |
88 ifeq ($(findstring BSD,$(UNAME_S)), BSD) |
86 PLATFORM = bsd |
89 PLATFORM = bsd |
87 endif |
90 endif |
88 endif |
91 endif |
89 |
92 |
|
93 # convert list of directories to dos paths |
|
94 define MixedDirs |
|
95 $(foreach i,$1,$(shell $(GETMIXEDPATH) "${i}")) |
|
96 endef |
|
97 |
90 ifdef ALT_SLASH_JAVA |
98 ifdef ALT_SLASH_JAVA |
91 SLASH_JAVA = $(ALT_SLASH_JAVA) |
99 SLASH_JAVA = $(ALT_SLASH_JAVA) |
92 endif |
100 endif |
93 |
101 |
94 # Root of this test area (important to use full paths in some places) |
102 # Root of this test area (important to use full paths in some places) |
120 $(ECHO) "$(ABS_JDK_IMAGE)"; \ |
128 $(ECHO) "$(ABS_JDK_IMAGE)"; \ |
121 else \ |
129 else \ |
122 $(ECHO) "$(ABS_PLATFORM_BUILD_ROOT)"; \ |
130 $(ECHO) "$(ABS_PLATFORM_BUILD_ROOT)"; \ |
123 fi) |
131 fi) |
124 PRODUCT_HOME := $(PRODUCT_HOME) |
132 PRODUCT_HOME := $(PRODUCT_HOME) |
|
133 endif |
|
134 |
|
135 # On Windows, setup the _NT_SYMBOL_PATH if possible. |
|
136 ifeq ($(PLATFORM), windows) |
|
137 ifndef _NT_SYMBOL_PATH |
|
138 ifdef PRODUCT_SYMBOLS_HOME |
|
139 _NT_SYMBOL_PATH := \ |
|
140 $(subst $(SPACE),;,$(strip $(call MixedDirs, $(sort $(dir $(wildcard \ |
|
141 $(addprefix $(PRODUCT_SYMBOLS_HOME)/bin/, *.pdb */*.pdb))))))) |
|
142 export _NT_SYMBOL_PATH |
|
143 endif |
|
144 endif |
|
145 JTREG_BASIC_OPTIONS += -e:_NT_SYMBOL_PATH='$(_NT_SYMBOL_PATH)' |
125 endif |
146 endif |
126 |
147 |
127 # Expect JPRT to set JPRT_PRODUCT_ARGS (e.g. -server etc.) |
148 # Expect JPRT to set JPRT_PRODUCT_ARGS (e.g. -server etc.) |
128 # Should be passed into 'java' only. |
149 # Should be passed into 'java' only. |
129 # Could include: -d64 -server -client OR any java option |
150 # Could include: -d64 -server -client OR any java option |
332 JTREG_EXCLUSIONS = |
353 JTREG_EXCLUSIONS = |
333 else |
354 else |
334 JTREG_EXCLUSIONS = $(PROBLEM_LISTS:%=-exclude:%) |
355 JTREG_EXCLUSIONS = $(PROBLEM_LISTS:%=-exclude:%) |
335 endif |
356 endif |
336 |
357 |
337 # convert list of directories to dos paths |
|
338 define MixedDirs |
|
339 $(foreach i,$1,$(shell $(GETMIXEDPATH) "${i}")) |
|
340 endef |
|
341 |
|
342 # ------------------------------------------------------------------ |
358 # ------------------------------------------------------------------ |
343 |
359 |
344 # When called from JPRT the TESTDIRS variable is set to the jtreg tests to run |
360 # When called from JPRT the TESTDIRS variable is set to the jtreg tests to run |
345 ifdef TESTDIRS |
361 ifdef TESTDIRS |
346 TEST_SELECTION = $(TESTDIRS) |
362 TEST_SELECTION = $(TESTDIRS) |