1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Erik Joelsson 2013-09-04 10:37:21 +02:00
commit a8a717451d
4 changed files with 11 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags-top-repo
View File

@ -226,3 +226,4 @@ d2dcb110e9dbaf9903c05b211df800e78e4b394e jdk8-b100
5eb3c1dc348f72a7f84f7d9d07834e8bbe09a799 jdk8-b102 5eb3c1dc348f72a7f84f7d9d07834e8bbe09a799 jdk8-b102
b7e64be81c8a7690703df5711f4fc2375da8a9cb jdk8-b103 b7e64be81c8a7690703df5711f4fc2375da8a9cb jdk8-b103
96c1b9b7524b52c3fcefc90ffad4c767396727c8 jdk8-b104 96c1b9b7524b52c3fcefc90ffad4c767396727c8 jdk8-b104
5166118c59178b5d31001bc4058e92486ee07d9b jdk8-b105

3
NewMakefile.gmk
View File

@ -98,6 +98,7 @@ help:
$(info . # corba and jdk) $(info . # corba and jdk)
$(info . make all # Compile everything, all repos and images) $(info . make all # Compile everything, all repos and images)
$(info . make images # Create complete j2sdk and j2re images) $(info . make images # Create complete j2sdk and j2re images)
$(info . make docs # Create javadocs)
$(info . make overlay-images # Create limited images for sparc 64 bit platforms) $(info . make overlay-images # Create limited images for sparc 64 bit platforms)
$(info . make profiles # Create complete j2re compact profile images) $(info . make profiles # Create complete j2re compact profile images)
$(info . make bootcycle-images # Build images twice, second time with newly build JDK) $(info . make bootcycle-images # Build images twice, second time with newly build JDK)
@ -109,7 +110,7 @@ help:
$(info . make test # Run tests, default is all tests (see TEST below)) $(info . make test # Run tests, default is all tests (see TEST below))
$(info ) $(info )
$(info Targets for specific components) $(info Targets for specific components)
$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, images or overlay-images)) $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
$(info . make <component> # Build <component> and everything it depends on. ) $(info . make <component> # Build <component> and everything it depends on. )
$(info . make <component>-only # Build <component> only, without dependencies. This) $(info . make <component>-only # Build <component> only, without dependencies. This)
$(info . # is faster but can result in incorrect build results!) $(info . # is faster but can result in incorrect build results!)

2
common/makefiles/Main.gmk
View File

@ -183,7 +183,7 @@ bootcycle-images-only: start-make
test: images test-only test: images test-only
test-only: start-make test-only: start-make
@$(call TargetEnter) @$(call TargetEnter)
@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
@$(call TargetExit) @$(call TargetExit)
# Stores the tips for each repository. This file is be used when constructing the jdk image and can be # Stores the tips for each repository. This file is be used when constructing the jdk image and can be

53
test/Makefile
View File

@ -49,61 +49,22 @@ else \
fi fi
endef endef
# Test target list for langtools repository
LANGTOOLS_TEST_LIST = langtools_jtreg
# Test target list for jdk repository
JDK_ALL_TEST_LIST = \
jdk_beans1 \
jdk_io \
jdk_lang \
jdk_math \
jdk_other \
jdk_net \
jdk_nio \
jdk_security1 \
jdk_text \
jdk_util \
jdk_time \
jdk_awt \
jdk_beans2 jdk_beans3 \
jdk_management \
jdk_jmx \
jdk_security2 jdk_security3 \
jdk_rmi \
jdk_sound \
jdk_swing \
jdk_tools \
jdk_jdi \
jdk_jfr
# Theses are meta test targets in jdk
JDK_META_TEST_LIST = jdk_all jdk_default jdk_core
# These are the current jck test targets in the jdk repository
JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
# Default test target (core) # Default test target (core)
default: jdk_core $(LANGTOOLS_TEST_LIST) default: jdk_core langtools_jtreg
# All testing # All testing
all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST) all: jdk_all langtools_all
# Test targets # Test targets
$(LANGTOOLS_TEST_LIST): langtools_% :
@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST): jdk_% :
@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)
clean:
################################################################ ################################################################
# Phony targets (e.g. these are not filenames) # Phony targets (e.g. these are not filenames)
.PHONY: all clean \ .PHONY: all clean
$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \
$(LANGTOOLS_TEST_LIST)
################################################################ ################################################################