From a420a8b984bd7f6a1d751e596976f8c1e8481cd8 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Fri, 12 Dec 2014 15:33:10 +0100 Subject: [PATCH 1/9] 8067254: No debug symbols in JPRT Windows builds Reviewed-by: tbell --- make/StripBinaries.gmk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/make/StripBinaries.gmk b/make/StripBinaries.gmk index 92bb17159a2..c05e2a1eef1 100644 --- a/make/StripBinaries.gmk +++ b/make/StripBinaries.gmk @@ -66,11 +66,6 @@ STRIP_LIBS_SRC := \ $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/modules_libs \ -name '*$(SHARED_LIBRARY_SUFFIX)' -type f) -# On Windows, don't include debug info for libs either. -ifeq ($(OPENJDK_TARGET_OS), windows) - COPY_LIBS_SRC := $(filter-out %.diz %.map %.pdb, $(COPY_LIBS_SRC)) -endif - $(eval $(call SetupCopyFiles,STRIP_MODULES_CMDS, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_cmds, \ DEST := $(MODULES_CMDS_STRIPPED), \ From f4e7330e548979193750cb9105661090a154d9b1 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Fri, 12 Dec 2014 15:38:57 +0100 Subject: [PATCH 2/9] 8067330: ZERO_ARCHDEF incorrectly defined for PPC/PPC64 architectures Reviewed-by: simonis, tbell, erikj --- common/autoconf/generated-configure.sh | 5 +++-- common/autoconf/platform.m4 | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 0b1567ce0ce..59c1a8ae9e8 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -4329,7 +4329,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++" #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1418036274 +DATE_WHEN_GENERATED=1418395009 ############################################################################### # @@ -13965,7 +13965,8 @@ $as_echo "$COMPILE_TYPE" >&6; } # ZERO_ARCHDEF is used to enable architecture-specific code case "${OPENJDK_TARGET_CPU}" in - ppc*) ZERO_ARCHDEF=PPC ;; + ppc) ZERO_ARCHDEF=PPC32 ;; + ppc64) ZERO_ARCHDEF=PPC64 ;; s390*) ZERO_ARCHDEF=S390 ;; sparc*) ZERO_ARCHDEF=SPARC ;; x86_64*) ZERO_ARCHDEF=AMD64 ;; diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4 index 27db8d047eb..6f26b855e95 100644 --- a/common/autoconf/platform.m4 +++ b/common/autoconf/platform.m4 @@ -367,7 +367,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS], # ZERO_ARCHDEF is used to enable architecture-specific code case "${OPENJDK_TARGET_CPU}" in - ppc*) ZERO_ARCHDEF=PPC ;; + ppc) ZERO_ARCHDEF=PPC32 ;; + ppc64) ZERO_ARCHDEF=PPC64 ;; s390*) ZERO_ARCHDEF=S390 ;; sparc*) ZERO_ARCHDEF=SPARC ;; x86_64*) ZERO_ARCHDEF=AMD64 ;; From 12c05a89f5fb808df9418b71bbfb17ae3becb2d7 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Mon, 15 Dec 2014 10:29:41 -0800 Subject: [PATCH 3/9] 8067360: verify-modules target was dropped in jdk9 b41 Reviewed-by: alanb, erikj --- make/Main.gmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/Main.gmk b/make/Main.gmk index ba4ba3c2219..c3b40e55b15 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -442,7 +442,7 @@ exploded-image: $(ALL_MODULE_TARGETS) # alias for ease of use. jdk: exploded-image -images: jimages demos samples zip-security +images: jimages demos samples zip-security verify-modules ifeq ($(OPENJDK_TARGET_OS), macosx) images: mac-bundles From a78b9855a813b285559537f8908f299bc28fcac2 Mon Sep 17 00:00:00 2001 From: Tristan Yan Date: Mon, 15 Dec 2014 13:09:39 -0800 Subject: [PATCH 4/9] 8065673: XML Test Colo: Add test build system for JAXP tests Reviewed-by: alanb, joehw --- make/jprt.properties | 10 +++++++++- test/Makefile | 8 ++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/make/jprt.properties b/make/jprt.properties index fdb18513f52..d9cd1498649 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -188,6 +188,13 @@ my.make.rule.test.targets.svc= \ ${my.test.target.set:TESTNAME=svc_tools}, \ ${my.make.rule.test.targets.svc.extra} +# JAXP vm test targets (testset=jaxp) +my.test.targets.jaxp= + +# JAXP test targets (testset=jaxp) +my.make.rule.test.targets.jaxp= \ + ${my.test.target.set:TESTNAME=jaxp_all} + # All vm test targets (testset=all) my.test.targets.all= \ ${my.test.targets.default}, \ @@ -211,7 +218,8 @@ my.test.targets.pit= \ my.make.rule.test.targets.pit= \ ${my.test.target.set:TESTNAME=langtools_jtreg}, \ ${my.make.rule.test.targets.core}, \ - ${my.make.rule.test.targets.svc} + ${my.make.rule.test.targets.svc} \ + ${my.make.rule.test.targets.jaxp} # JCK test targets in test/Makefile (no windows) my.test.target.set.jck= \ diff --git a/test/Makefile b/test/Makefile index 89141cce04b..64d93fc929a 100644 --- a/test/Makefile +++ b/test/Makefile @@ -33,6 +33,7 @@ TOPDIR=.. # This makefile depends on the availability of sibling directories. LANGTOOLS_DIR=$(TOPDIR)/langtools JDK_DIR=$(TOPDIR)/jdk +JAXP_DIR=$(TOPDIR)/jaxp HOTSPOT_DIR=$(TOPDIR)/hotspot # Macro to run a test target in a subdir @@ -51,10 +52,10 @@ fi endef # Default test target (core) -default: jdk_core langtools_jtreg +default: jdk_core langtools_jtreg jaxp_all # All testing -all: jdk_all langtools_all +all: jdk_all langtools_all jaxp_all # Test targets langtools_% : @@ -63,6 +64,9 @@ langtools_% : jdk_% core_%s svc_%: @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@) +jaxp_%: + @$(NO_STOPPING)$(call SUBDIR_TEST, $(JAXP_DIR), TEST="$@" $@) + hotspot_%: @$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), TEST="$@" $@) From f158033fdade3537df3f01e69bc41ba155ee431c Mon Sep 17 00:00:00 2001 From: Andreas Lundblad Date: Tue, 16 Dec 2014 11:28:34 +0100 Subject: [PATCH 5/9] 8066138: Trailing whitespace in title of javadoc: Overview (Java Platform SE 7 ) Trims whitespace of arguments in OptionOnly, OptionPair and OptionTrip. Reviewed-by: erikj --- make/Javadoc.gmk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk index d68c6f333ce..94078328315 100644 --- a/make/Javadoc.gmk +++ b/make/Javadoc.gmk @@ -231,17 +231,17 @@ endef # Common echo of option define OptionOnly # opt - if [ "$1" != "" ] ; then \ - $(PRINTF) "%s\n" "$1"; \ + if [ "$(strip $1)" != "" ] ; then \ + $(PRINTF) "%s\n" "$(strip $1)"; \ fi endef define OptionPair # opt arg - $(PRINTF) "%s '%s'\n" "$1" '$2' + $(PRINTF) "%s '%s'\n" "$(strip $1)" '$(strip $2)' endef define OptionTrip # opt arg arg - $(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3' + $(PRINTF) "%s '%s' '%s'\n" "$(strip $1)" '$(strip $2)' '$(strip $3)' endef # Core api bottom argument (with special sauce) From 8ecec7ff2c6902577914adb0775c9b9ccfdc5b87 Mon Sep 17 00:00:00 2001 From: Erik Helin Date: Tue, 16 Dec 2014 12:53:25 +0100 Subject: [PATCH 6/9] 8067442: Tests using -Xshare:dump does not work with 'make test' Reviewed-by: erikj, dholmes --- make/Main.gmk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/Main.gmk b/make/Main.gmk index c3b40e55b15..383b0590bcb 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -257,7 +257,7 @@ ALL_TARGETS += docs-javadoc docs-jvmtidoc test: ($(CD) $(SRC_ROOT)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \ - JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_OUTPUTDIR) \ + JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) \ ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true test-make: @@ -394,7 +394,7 @@ else docs-jvmtidoc: hotspot - test: exploded-image + test: jimages verify-modules: exploded-image From 7d8f013196c22e20d5908eded9db3dcd6a2edf72 Mon Sep 17 00:00:00 2001 From: Stuart Marks Date: Mon, 15 Dec 2014 17:49:56 -0800 Subject: [PATCH 7/9] 8067631: hgforest.sh mishandles arguments with spaces Reviewed-by: chegar --- common/bin/hgforest.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/common/bin/hgforest.sh b/common/bin/hgforest.sh index 5bf586bc13c..244881ae77c 100644 --- a/common/bin/hgforest.sh +++ b/common/bin/hgforest.sh @@ -106,12 +106,15 @@ if [ ${vflag} = "true" ] ; then echo "# Mercurial command: ${command}" > ${status_output} fi - -# capture command options and arguments (if any) -command_args="${@:-}" +# At this point all command options and args are in "$@". +# Always use "$@" (within double quotes) to avoid breaking +# args with spaces into separate args. if [ ${vflag} = "true" ] ; then - echo "# Mercurial command arguments: ${command_args}" > ${status_output} + echo "# Mercurial command argument count: $#" > ${status_output} + for cmdarg in "$@" ; do + echo "# Mercurial command argument: ${cmdarg}" > ${status_output} + done fi # Clean out the temporary directory that stores the pid files. @@ -205,13 +208,14 @@ if [ "${command}" = "clone" -o "${command}" = "fclone" -o "${command}" = "tclone pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'` - if [ -n "${command_args}" ] ; then + if [ $# -gt 0 ] ; then # if there is an "extra sources" path then reparent "extra" repos to that path if [ "x${pull_default}" = "x${pull_default_tail}" ] ; then echo "ERROR: Need initial clone from non-local source" > ${status_output} exit 1 fi - pull_extra="${command_args}/${pull_default_tail}" + # assume that "extra sources" path is the first arg + pull_extra="${1}/${pull_default_tail}" # determine which extra subrepos need to be cloned. for i in ${subrepos_extra} ; do @@ -356,8 +360,8 @@ else (PYTHONUNBUFFERED=true hg${global_opts} clone ${clone_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc ) 2>&1 & else # run the command. - echo "cd ${i} && hg${global_opts} ${command} ${command_args}" > ${status_output} - cd ${i} && (PYTHONUNBUFFERED=true hg${global_opts} ${command} ${command_args}; echo "$?" > ${tmp}/${repopidfile}.pid.rc ) 2>&1 & + echo "cd ${i} && hg${global_opts} ${command} ${@}" > ${status_output} + cd ${i} && (PYTHONUNBUFFERED=true hg${global_opts} ${command} "${@}"; echo "$?" > ${tmp}/${repopidfile}.pid.rc ) 2>&1 & fi echo $! > ${tmp}/${repopidfile}.pid From f8731d01ac80b9f0da9c5ab86a24d8ae77364bf5 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Wed, 17 Dec 2014 16:36:21 -0800 Subject: [PATCH 8/9] 8067829: Remove setting -bootclasspath $(JDK_OUTPUTDIR)/classes from Javadoc.gmk Reviewed-by: erikj --- make/Javadoc.gmk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk index 94078328315..a12d0df7cee 100644 --- a/make/Javadoc.gmk +++ b/make/Javadoc.gmk @@ -53,8 +53,7 @@ BUILD_NUMBER=$(JDK_BUILD_NUMBER) JAVADOC_CMD = $(JAVA) \ -Djava.awt.headless=true \ - $(NEW_JAVADOC) \ - -bootclasspath $(JDK_OUTPUTDIR)/classes + $(NEW_JAVADOC) # Copyright year for beginning of Java and some of the apis # (Needed when creating the javadocs) From ec11dd0153100325a6a0e12f199dc18817c3e056 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Thu, 18 Dec 2014 13:56:46 -0800 Subject: [PATCH 9/9] 8067898: Disable verify-modules until JDK-8067479 is resolved Reviewed-by: ksrini --- make/Main.gmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/Main.gmk b/make/Main.gmk index 383b0590bcb..0f705491b0a 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -442,7 +442,7 @@ exploded-image: $(ALL_MODULE_TARGETS) # alias for ease of use. jdk: exploded-image -images: jimages demos samples zip-security verify-modules +images: jimages demos samples zip-security ifeq ($(OPENJDK_TARGET_OS), macosx) images: mac-bundles