Merge
This commit is contained in:
J. Duke
commit
af757204d4
@ -285,3 +285,4 @@ d42c0a90afc3c66ca87543076ec9aafd4b4680de jdk9-b38
|
||||
cf136458ee747e151a27aa9ea0c1492ea55ef3e7 jdk9-b40
|
||||
67395f7ca2db3b52e3a62a84888487de5cb9210a jdk9-b41
|
||||
f7c11da0b0481d49cc7a65a453336c108191e821 jdk9-b42
|
||||
02ee8c65622e8bd97496d584e22fc7dcf0edc4ae jdk9-b43
|
||||
|
||||
@ -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 ;;
|
||||
|
||||
@ -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 ;;
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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)
|
||||
@ -231,17 +230,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)
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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), \
|
||||
|
||||
@ -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= \
|
||||
|
||||
@ -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="$@" $@)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user