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

Merge

Browse Source
This commit is contained in:
J. Duke 2017-07-05 18:40:46 +02:00
commit 8911e12adf
12 changed files with 376 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags-top-repo
View File

@ -198,3 +198,4 @@ c1be681d80a1f1c848dc671d664fccb19e046a12 jdk8-b72
b43aa5bd8ca5c8121336495382d35ecfa7a71536 jdk8-b74 b43aa5bd8ca5c8121336495382d35ecfa7a71536 jdk8-b74
2a713921952cbd77a1e699626976cb6cdfe3e57e jdk8-b75 2a713921952cbd77a1e699626976cb6cdfe3e57e jdk8-b75
278af9fc67e7eba2884936b49ec07345f423aabb jdk8-b76 278af9fc67e7eba2884936b49ec07345f423aabb jdk8-b76
3933eebc659d58c597aa8cb4b3e58f2250ce3e1a jdk8-b77

1
NewMakefile.gmk
View File

@ -96,6 +96,7 @@ help:
$(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 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 bootcycle-images # Build images twice, second time with newly build JDK) $(info . make bootcycle-images # Build images twice, second time with newly build JDK)
$(info . make install # Install the generated images locally) $(info . make install # Install the generated images locally)
$(info . make clean # Remove all files generated by make, but not those) $(info . make clean # Remove all files generated by make, but not those)

482
common/autoconf/generated-configure.sh
View File

File diff suppressed because it is too large Load Diff

3
common/autoconf/spec.gmk.in
View File

@ -282,6 +282,9 @@ X_CFLAGS:=@X_CFLAGS@
X_LIBS:=@X_LIBS@ X_LIBS:=@X_LIBS@
OPENWIN_HOME:=@OPENWIN_HOME@ OPENWIN_HOME:=@OPENWIN_HOME@
# The lowest required version of macosx to enforce compatiblity for
MACOSX_REQUIRED_VERSION=@MACOSX_REQUIRED_VERSION@
# There are two types: CC or CL # There are two types: CC or CL
# CC is gcc and others behaving reasonably similar. # CC is gcc and others behaving reasonably similar.
# CL is cl.exe only. # CL is cl.exe only.

4
common/autoconf/toolchain.m4
View File

@ -876,6 +876,10 @@ if test "x$OPENJDK_TARGET_OS" = xsolaris; then
fi fi
if test "x$OPENJDK_TARGET_OS" = xmacosx; then if test "x$OPENJDK_TARGET_OS" = xmacosx; then
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE" CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
# Adding these macros will make it an error to link to mac APIs newer than OS version 10.7
MACOSX_REQUIRED_VERSION=1070
AC_SUBST(MACOSX_REQUIRED_VERSION)
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(MACOSX_REQUIRED_VERSION)"
fi fi
if test "x$OPENJDK_TARGET_OS" = xbsd; then if test "x$OPENJDK_TARGET_OS" = xbsd; then
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE" CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"

59
common/bin/hgforest.sh
View File

@ -64,33 +64,33 @@ rm -f -r ${tmp}
mkdir -p ${tmp} mkdir -p ${tmp}
safe_interrupt () { safe_interrupt () {
if [ -d ${tmp} ]; then if [ -d ${tmp} ]; then
if [ "`ls ${tmp}`" != "" ]; then if [ "`ls ${tmp}/*.pid`" != "" ]; then
echo "Waiting for processes ( `cat ${tmp}/* | tr '\n' ' '`) to terminate nicely!" echo "Waiting for processes ( `cat ${tmp}/*.pid | tr '\n' ' '`) to terminate nicely!"
sleep 1 sleep 1
# Pipe stderr to dev/null to silence kill, that complains when trying to kill # Pipe stderr to dev/null to silence kill, that complains when trying to kill
# a subprocess that has already exited. # a subprocess that has already exited.
kill -TERM `cat ${tmp}/* | tr '\n' ' '` 2> /dev/null kill -TERM `cat ${tmp}/*.pid | tr '\n' ' '` 2> /dev/null
wait wait
echo Interrupt complete! echo Interrupt complete!
fi fi
fi fi
rm -f -r ${tmp} rm -f -r ${tmp}
exit 1 exit 1
} }
nice_exit () { nice_exit () {
if [ -d ${tmp} ]; then if [ -d ${tmp} ]; then
if [ "`ls ${tmp}`" != "" ]; then if [ "`ls ${tmp}`" != "" ]; then
wait wait
fi fi
fi fi
rm -f -r ${tmp} rm -f -r ${tmp}
} }
trap 'safe_interrupt' INT QUIT trap 'safe_interrupt' INT QUIT
trap 'nice_exit' EXIT trap 'nice_exit' EXIT
# Only look in specific locations for possible forests (avoids long searches) # Only look in specific locations for possible forests (avoids long searches)
pull_default="" pull_default=""
repos="" repos=""
@ -172,14 +172,26 @@ for i in ${repos} ${repos_extra} ; do
if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`" pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`"
echo ${hg} clone ${pull_newrepo} ${i} echo ${hg} clone ${pull_newrepo} ${i}
${hg} clone ${pull_newrepo} ${i} & path="`dirname ${i}`"
if [ "${path}" != "." ] ; then
times=0
while [ ! -d "${path}" ] ## nested repo, ensure containing dir exists
do
times=`expr ${times} '+' 1`
if [ `expr ${times} '%' 10` -eq 0 ] ; then
echo ${path} still not created, waiting...
fi
sleep 5
done
fi
(${hg} clone ${pull_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc )&
else else
echo "cd ${i} && ${hg} $*" echo "cd ${i} && ${hg} $*"
cd ${i} && ${hg} "$@" & cd ${i} && (${hg} "$@"; echo "$?" > ${tmp}/${repopidfile}.pid.rc )&
fi fi
echo $! > ${tmp}/${repopidfile}.pid echo $! > ${tmp}/${repopidfile}.pid
) 2>&1 | sed -e "s@^@${reponame}: @") & ) 2>&1 | sed -e "s@^@${reponame}: @") &
if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then
sleep 2 sleep 2
echo Waiting 5 secs before spawning next background command. echo Waiting 5 secs before spawning next background command.
@ -189,6 +201,15 @@ done
# Wait for all hg commands to complete # Wait for all hg commands to complete
wait wait
# Terminate with exit 0 all the time (hard to know when to say "failed") # Terminate with exit 0 only if all subprocesses were successful
exit 0 ec=0
if [ -d ${tmp} ]; then
for rc in ${tmp}/*.pid.rc ; do
exit_code=`cat ${rc} | tr -d ' \n\r'`
if [ "${exit_code}" != "0" ] ; then
echo "WARNING: ${rc} exited abnormally."
ec=1
fi
done
fi
exit ${ec}

18
common/makefiles/Main.gmk
View File

@ -129,7 +129,9 @@ demos-only: start-make
@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos) @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos)
@$(call TargetExit) @$(call TargetExit)
images: source-tips demos images-only # Note: This double-colon rule is intentional, to support
# custom make file integration.
images:: source-tips demos images-only
images-only: start-make images-only: start-make
@$(call TargetEnter) @$(call TargetEnter)
@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images) @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
@ -141,6 +143,17 @@ overlay-images-only: start-make
@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images) @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
@$(call TargetExit) @$(call TargetExit)
profiles: profiles-oscheck source-tips jdk hotspot profiles-only
profiles-only: start-make
@$(call TargetEnter)
@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles)
@$(call TargetExit)
profiles-oscheck:
ifneq ($(OPENJDK_TARGET_OS), linux)
@echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
endif
install: images install-only install: images install-only
install-only: start-make install-only: start-make
@$(call TargetEnter) @$(call TargetEnter)
@ -167,7 +180,7 @@ bootcycle-images:
test: start-make test: start-make
@$(call TargetEnter) @$(call TargetEnter)
@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) MAKEFLAGS= -j1 PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(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
@ -224,5 +237,6 @@ clean-docs:
.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only .PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only
.PHONY: all test clean dist-clean bootcycle-images start-make .PHONY: all test clean dist-clean bootcycle-images start-make
.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build .PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build
.PHONY: profiles profiles-only profiles-oscheck
FRC: # Force target FRC: # Force target

4
common/makefiles/javadoc/CORE_PKGS.gmk
View File

@ -128,9 +128,9 @@ CORE_PKGS = \
java.text \ java.text \
java.text.spi \ java.text.spi \
java.time \ java.time \
java.time.temporal \ java.time.chrono \
java.time.calendar \
java.time.format \ java.time.format \
java.time.temporal \
java.time.zone \ java.time.zone \
java.util \ java.util \
java.util.concurrent \ java.util.concurrent \

1
common/makefiles/javadoc/Javadoc.gmk
View File

@ -267,6 +267,7 @@ COMMON_JAVADOCFLAGS = \
-use \ -use \
-keywords \ -keywords \
-Xdoclint:none \ -Xdoclint:none \
-Xprofilespath $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \
$(ADDITIONAL_JAVADOCFLAGS) $(ADDITIONAL_JAVADOCFLAGS)
ifdef OPENJDK ifdef OPENJDK

2
get_source.sh
View File

@ -26,7 +26,7 @@
# #
# Get clones of all nested repositories # Get clones of all nested repositories
sh ./common/bin/hgforest.sh clone "$@" sh ./common/bin/hgforest.sh clone "$@" || exit 1
# Update all existing repositories to the latest sources # Update all existing repositories to the latest sources
sh ./common/bin/hgforest.sh pull -u sh ./common/bin/hgforest.sh pull -u

68
make/scripts/webrev.ksh
View File

@ -19,7 +19,7 @@
# #
# CDDL HEADER END # CDDL HEADER END
# #
# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms. # Use is subject to license terms.
# #
# This script takes a file list and a workspace and builds a set of html files # This script takes a file list and a workspace and builds a set of html files
@ -27,7 +27,7 @@
# Documentation is available via 'webrev -h'. # Documentation is available via 'webrev -h'.
# #
WEBREV_UPDATED=23.18-hg WEBREV_UPDATED=23.18-hg+jbs
HTML='<?xml version="1.0"?> HTML='<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@ -146,7 +146,7 @@ html_quote()
# #
bug2url() bug2url()
{ {
sed -e 's|[0-9]\{5,\}|<a href=\"'$BUGURL'&\">&</a>|g' sed -e 's|[0-9]\{5,\}|<a href=\"'$BUGURL$IDPREFIX'&\">&</a>|g'
} }
# #
@ -230,8 +230,8 @@ strip_unchanged()
# $ sdiff_to_html old/usr/src/tools/scripts/webrev.sh \ # $ sdiff_to_html old/usr/src/tools/scripts/webrev.sh \
# new/usr/src/tools/scripts/webrev.sh \ # new/usr/src/tools/scripts/webrev.sh \
# webrev.sh usr/src/tools/scripts \ # webrev.sh usr/src/tools/scripts \
# '<a href="http://monaco.sfbay.sun.com/detail.jsp?cr=1234567"> # '<a href="https://jbs.oracle.com/bugs/browse/JDK-1234567">
# 1234567</a> my bugid' > <file>.html # JDK-1234567</a> my bugid' > <file>.html
# #
# framed_sdiff() is then called which creates $2.frames.html # framed_sdiff() is then called which creates $2.frames.html
# in the webrev tree. # in the webrev tree.
@ -1160,7 +1160,7 @@ comments_from_mercurial()
print "$comm" print "$comm"
return return
fi fi
print "$comm" | html_quote | bug2url | sac2url print "$comm" | html_quote | bug2url | sac2url
) )
fi fi
@ -1418,7 +1418,7 @@ function outgoing_from_mercurial_forest
next;} next;}
END {for (tree in trees) END {for (tree in trees)
{ rev=revs[trees[tree]]; { rev=revs[trees[tree]];
if (rev > 0) if (rev > 0)
{printf("%s %d\n",trees[tree],rev-1)} {printf("%s %d\n",trees[tree],rev-1)}
}}' | while read LINE }}' | while read LINE
do do
@ -1459,7 +1459,7 @@ function treestatus
{ {
TREE=$1 TREE=$1
HGCMD="hg -R $CWS/$TREE status $FSTAT_OPT" HGCMD="hg -R $CWS/$TREE status $FSTAT_OPT"
$HGCMD -mdn 2>/dev/null | $FILTER | while read F $HGCMD -mdn 2>/dev/null | $FILTER | while read F
do do
echo $TREE/$F echo $TREE/$F
@ -1543,7 +1543,7 @@ function fstatus
if (n == 0) if (n == 0)
{ printf("A %s/%s\n",tree,$2)} { printf("A %s/%s\n",tree,$2)}
else else
{ printf("A %s\n",$2)}; { printf("A %s\n",$2)};
next} next}
/^ / {n=index($1,tree); /^ / {n=index($1,tree);
if (n == 0) if (n == 0)
@ -1604,7 +1604,7 @@ function fstatus
# We need at least one of default-push or default paths set in .hg/hgrc # We need at least one of default-push or default paths set in .hg/hgrc
# If neither are set we don't know who to compare with. # If neither are set we don't know who to compare with.
function flist_from_mercurial function flist_from_mercurial
{ {
# if [ "${PWS##ssh://}" != "$PWS" -o \ # if [ "${PWS##ssh://}" != "$PWS" -o \
# "${PWS##http://}" != "$PWS" -o \ # "${PWS##http://}" != "$PWS" -o \
@ -1757,7 +1757,7 @@ function look_for_prog
elif [[ "$OS" == "Linux" ]]; then elif [[ "$OS" == "Linux" ]]; then
DEVTOOLS="/java/devtools/linux/bin" DEVTOOLS="/java/devtools/linux/bin"
fi fi
ppath=$PATH ppath=$PATH
ppath=$ppath:/usr/sfw/bin:/usr/bin:/usr/sbin ppath=$ppath:/usr/sfw/bin:/usr/bin:/usr/sbin
ppath=$ppath:/opt/teamware/bin:/opt/onbld/bin ppath=$ppath:/opt/teamware/bin:/opt/onbld/bin
@ -1844,7 +1844,7 @@ function extract_ssh_infos
ssh_host=`echo $CMD | sed -e 's/ssh:\/\/\([^/]*\)\/.*/\1/'` ssh_host=`echo $CMD | sed -e 's/ssh:\/\/\([^/]*\)\/.*/\1/'`
ssh_dir=`echo $CMD | sed -e 's/ssh:\/\/[^/]*\/\(.*\)/\1/'` ssh_dir=`echo $CMD | sed -e 's/ssh:\/\/[^/]*\/\(.*\)/\1/'`
fi fi
} }
function build_old_new_mercurial function build_old_new_mercurial
@ -2096,7 +2096,7 @@ do
PARENT_REV=$OPTARG;; PARENT_REV=$OPTARG;;
v) print "$0 version: $WEBREV_UPDATED";; v) print "$0 version: $WEBREV_UPDATED";;
?) usage;; ?) usage;;
esac esac
@ -2338,7 +2338,7 @@ if [[ $SCM_MODE == "teamware" ]]; then
# #
[[ -z $codemgr_ws && -n $CODEMGR_WS ]] && codemgr_ws=$CODEMGR_WS [[ -z $codemgr_ws && -n $CODEMGR_WS ]] && codemgr_ws=$CODEMGR_WS
[[ -z $codemgr_ws && -n $WSPACE ]] && codemgr_ws=`$WSPACE name` [[ -z $codemgr_ws && -n $WSPACE ]] && codemgr_ws=`$WSPACE name`
if [[ -n $codemgr_ws && ! -d $codemgr_ws ]]; then if [[ -n $codemgr_ws && ! -d $codemgr_ws ]]; then
print -u2 "$codemgr_ws: no such workspace" print -u2 "$codemgr_ws: no such workspace"
exit 1 exit 1
@ -2521,10 +2521,16 @@ print " Output to: $WDIR"
# Bug IDs will be replaced by a URL. Order of precedence # Bug IDs will be replaced by a URL. Order of precedence
# is: default location, $WEBREV_BUGURL, the -O flag. # is: default location, $WEBREV_BUGURL, the -O flag.
# #
BUGURL='http://monaco.sfbay.sun.com/detail.jsp?cr=' BUGURL='https://jbs.oracle.com/bugs/browse/'
[[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL" [[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL"
[[ -n "$Oflag" ]] && \ if [[ -n "$Oflag" ]]; then
CRID=`echo $CRID | sed -e 's/JDK-//'`
BUGURL='http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=' BUGURL='http://bugs.sun.com/bugdatabase/view_bug.do?bug_id='
IDPREFIX=''
else
IDPREFIX='JDK-'
fi
# #
# Likewise, ARC cases will be replaced by a URL. Order of precedence # Likewise, ARC cases will be replaced by a URL. Order of precedence
@ -2561,7 +2567,7 @@ fi
# #
# Should we ignore changes in white spaces when generating diffs? # Should we ignore changes in white spaces when generating diffs?
# #
if [[ -n $bflag ]]; then if [[ -n $bflag ]]; then
DIFFOPTS="-t" DIFFOPTS="-t"
else else
@ -2748,7 +2754,7 @@ do
fi fi
fi fi
else else
# #
# If we have old and new versions of the file then run the # If we have old and new versions of the file then run the
# appropriate diffs. This is complicated by a couple of factors: # appropriate diffs. This is complicated by a couple of factors:
@ -3000,22 +3006,31 @@ fi
# external URL has a <title> like: # external URL has a <title> like:
# <title>Bug ID: 6641309 Wrong Cookie separator used in HttpURLConnection</title> # <title>Bug ID: 6641309 Wrong Cookie separator used in HttpURLConnection</title>
# while internal URL has <title> like: # while internal URL has <title> like:
# <title>6641309: Wrong Cookie separator used in HttpURLConnection</title> # <title>[#JDK-6641309] Wrong Cookie separator used in HttpURLConnection</title>
# #
if [[ -n $CRID ]]; then if [[ -n $CRID ]]; then
for id in $CRID for id in $CRID
do do
if [[ -z "$Oflag" ]]; then
#add "JDK-" to raw bug id for jbs links.
id=`echo ${id} | sed 's/^\([0-9]\{5,\}\)$/JDK-\1/'`
fi
print "<tr><th>Bug id:</th><td>" print "<tr><th>Bug id:</th><td>"
url="${BUGURL}${id}" url="${BUGURL}${id}"
if [[ -n $WGET ]]; then if [[ -n "$Oflag" ]]; then
msg=`$WGET -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed 's/Bug ID://'` cleanup='s/Bug ID: \([0-9]\{5,\}\) \(.*\)/JDK-\1 : \2/'
fi
if [[ -n $msg ]]; then
print "<a href=\"$url\">$msg</a>"
else else
print $id | bug2url cleanup='s|\[#\(JDK-[0-9]\{5,\}\)\] \(.*\)|\1 : \2|'
fi fi
if [[ -n $WGET ]]; then
msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup"`
fi
if [[ -z $msg ]]; then
msg="${id}"
fi
print "<a href=\"$url\">$msg</a>"
print "</td></tr>" print "</td></tr>"
done done
fi fi
@ -3179,4 +3194,3 @@ exec 3<&- # close FD 3.
print "Done." print "Done."
print "Output to: $WDIR" print "Output to: $WDIR"

24
test/Makefile
View File

@ -38,8 +38,8 @@ JDK_DIR=$(TOPDIR)/jdk
define SUBDIR_TEST # subdirectory target define SUBDIR_TEST # subdirectory target
if [ -d $1 ] ; then \ if [ -d $1 ] ; then \
if [ -r $1/test/Makefile ] ; then \ if [ -r $1/test/Makefile ] ; then \
echo "$(MAKE) -C $1/test $2" ; \ echo "$(MAKE) -k -C $1/test $2" ; \
$(MAKE) -C $1/test $2 ; \ $(MAKE) -k -C $1/test $2 ; \
else \ else \
echo "ERROR: File does not exist: $1/test/Makefile"; \ echo "ERROR: File does not exist: $1/test/Makefile"; \
exit 1; \ exit 1; \
@ -53,7 +53,7 @@ endef
LANGTOOLS_TEST_LIST = langtools_jtreg LANGTOOLS_TEST_LIST = langtools_jtreg
# Test target list for jdk repository # Test target list for jdk repository
JDK_DEFAULT_TEST_LIST = \ JDK_ALL_TEST_LIST = \
jdk_beans1 \ jdk_beans1 \
jdk_io \ jdk_io \
jdk_lang \ jdk_lang \
@ -64,10 +64,7 @@ JDK_DEFAULT_TEST_LIST = \
jdk_security1 \ jdk_security1 \
jdk_text \ jdk_text \
jdk_util \ jdk_util \
jdk_time jdk_time \
# These tests are not part of the default testing list
JDK_NONDEFAULT_TEST_LIST = \
jdk_awt \ jdk_awt \
jdk_beans2 jdk_beans3 \ jdk_beans2 jdk_beans3 \
jdk_management \ jdk_management \
@ -80,14 +77,14 @@ JDK_NONDEFAULT_TEST_LIST = \
jdk_jdi \ jdk_jdi \
jdk_jfr jdk_jfr
# All jdk tests # Theses are meta test targets in jdk
JDK_ALL_TEST_LIST = $(JDK_DEFAULT_TEST_LIST) $(JDK_NONDEFAULT_TEST_LIST) JDK_META_TEST_LIST = jdk_all jdk_default jdk_core
# These are the current jck test targets in the jdk repository # These are the current jck test targets in the jdk repository
JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
# Default test target (everything) # Default test target (core)
default: $(JDK_DEFAULT_TEST_LIST) $(LANGTOOLS_TEST_LIST) default: jdk_core $(LANGTOOLS_TEST_LIST)
# All testing # All testing
all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST) all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST)
@ -95,7 +92,8 @@ all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST)
# Test targets # Test targets
$(LANGTOOLS_TEST_LIST): $(LANGTOOLS_TEST_LIST):
@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
$(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST):
$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST):
@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
clean: clean:
@ -104,7 +102,7 @@ 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_JCK7_LIST) \ $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \
$(LANGTOOLS_TEST_LIST) $(LANGTOOLS_TEST_LIST)
################################################################ ################################################################