comparison test/Makefile @ 25662:056656d69979

8051399: Fix for JDK-8043071 breaks dev build Reviewed-by: xuelei
author weijun
date Sat, 19 Jul 2014 11:22:08 +0800
parents 9f542d8601a8
children 2842cbf0da97
comparison
equal deleted inserted replaced
16:e87cabf86b03 17:81a4ea6e431c
31 TOPDIR=.. 31 TOPDIR=..
32 32
33 # This makefile depends on the availability of sibling directories. 33 # This makefile depends on the availability of sibling directories.
34 LANGTOOLS_DIR=$(TOPDIR)/langtools 34 LANGTOOLS_DIR=$(TOPDIR)/langtools
35 JDK_DIR=$(TOPDIR)/jdk 35 JDK_DIR=$(TOPDIR)/jdk
36 HOTSPOT_DIR=$(TOPDIR)/hotspot
36 37
37 # Macro to run a test target in a subdir 38 # Macro to run a test target in a subdir
38 define SUBDIR_TEST # subdirectory target 39 define SUBDIR_TEST # subdirectory target
39 if [ -d $1 ] ; then \ 40 if [ -d $1 ] ; then \
40 if [ -r $1/test/Makefile ] ; then \ 41 if [ -r $1/test/Makefile ] ; then \
60 @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) 61 @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
61 62
62 jdk_% core_%s svc_%: 63 jdk_% core_%s svc_%:
63 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@) 64 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)
64 65
66 hotspot_%:
67 @$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), TEST="$@" $@)
68
65 ################################################################ 69 ################################################################
66 70
67 # Phony targets (e.g. these are not filenames) 71 # Phony targets (e.g. these are not filenames)
68 .PHONY: all clean 72 .PHONY: all clean
69 73