equal
deleted
inserted
replaced
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 JAXP_DIR=$(TOPDIR)/jaxp |
36 HOTSPOT_DIR=$(TOPDIR)/hotspot |
37 HOTSPOT_DIR=$(TOPDIR)/hotspot |
37 |
38 |
38 # Macro to run a test target in a subdir |
39 # Macro to run a test target in a subdir |
39 define SUBDIR_TEST # subdirectory target |
40 define SUBDIR_TEST # subdirectory target |
40 if [ -d $1 ] ; then \ |
41 if [ -d $1 ] ; then \ |
49 echo "WARNING: No testing done, directory does not exist: $1"; \ |
50 echo "WARNING: No testing done, directory does not exist: $1"; \ |
50 fi |
51 fi |
51 endef |
52 endef |
52 |
53 |
53 # Default test target (core) |
54 # Default test target (core) |
54 default: jdk_core langtools_jtreg |
55 default: jdk_core langtools_jtreg jaxp_all |
55 |
56 |
56 # All testing |
57 # All testing |
57 all: jdk_all langtools_all |
58 all: jdk_all langtools_all jaxp_all |
58 |
59 |
59 # Test targets |
60 # Test targets |
60 langtools_% : |
61 langtools_% : |
61 @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) |
62 @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) |
62 |
63 |
63 jdk_% core_%s svc_%: |
64 jdk_% core_%s svc_%: |
64 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@) |
65 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@) |
|
66 |
|
67 jaxp_%: |
|
68 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JAXP_DIR), TEST="$@" $@) |
65 |
69 |
66 hotspot_%: |
70 hotspot_%: |
67 @$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), TEST="$@" $@) |
71 @$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), TEST="$@" $@) |
68 |
72 |
69 # |
73 # |