Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Sun, 17 Feb 2013 16:44:28 -0500
- author
- dholmes
- date
- Sun, 17 Feb 2013 16:44:28 -0500
- changeset 627
- 28071e4ca1de
- parent 626
- bebeaa04ab8e
- parent 620
- bbb7548d45c7
- child 628
- fd1a5574cf68
Merge
| common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions | |
| common/makefiles/Main.gmk | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Feb 04 18:08:42 2013 -0500 1.2 +++ b/.hgtags Sun Feb 17 16:44:28 2013 -0500 1.3 @@ -196,3 +196,6 @@ 1.4 c1be681d80a1f1c848dc671d664fccb19e046a12 jdk8-b72 1.5 93b9664f97eeb6f89397a8842318ebacaac9feb9 jdk8-b73 1.6 b43aa5bd8ca5c8121336495382d35ecfa7a71536 jdk8-b74 1.7 +2a713921952cbd77a1e699626976cb6cdfe3e57e jdk8-b75 1.8 +278af9fc67e7eba2884936b49ec07345f423aabb jdk8-b76 1.9 +3933eebc659d58c597aa8cb4b3e58f2250ce3e1a jdk8-b77
2.1 --- a/common/autoconf/generated-configure.sh Mon Feb 04 18:08:42 2013 -0500 2.2 +++ b/common/autoconf/generated-configure.sh Sun Feb 17 16:44:28 2013 -0500 2.3 @@ -3731,7 +3731,7 @@ 2.4 #CUSTOM_AUTOCONF_INCLUDE 2.5 2.6 # Do not change or remove the following line, it is needed for consistency checks: 2.7 -DATE_WHEN_GENERATED=1359938124 2.8 +DATE_WHEN_GENERATED=1361137039 2.9 2.10 ############################################################################### 2.11 #
3.1 --- a/common/bin/hgforest.sh Mon Feb 04 18:08:42 2013 -0500 3.2 +++ b/common/bin/hgforest.sh Sun Feb 17 16:44:28 2013 -0500 3.3 @@ -64,33 +64,33 @@ 3.4 mkdir -p ${tmp} 3.5 3.6 safe_interrupt () { 3.7 - if [ -d ${tmp} ]; then 3.8 - if [ "`ls ${tmp}`" != "" ]; then 3.9 - echo "Waiting for processes ( `cat ${tmp}/* | tr '\n' ' '`) to terminate nicely!" 3.10 + if [ -d ${tmp} ]; then 3.11 + if [ "`ls ${tmp}/*.pid`" != "" ]; then 3.12 + echo "Waiting for processes ( `cat ${tmp}/*.pid | tr '\n' ' '`) to terminate nicely!" 3.13 sleep 1 3.14 # Pipe stderr to dev/null to silence kill, that complains when trying to kill 3.15 # a subprocess that has already exited. 3.16 - kill -TERM `cat ${tmp}/* | tr '\n' ' '` 2> /dev/null 3.17 - wait 3.18 - echo Interrupt complete! 3.19 - fi 3.20 + kill -TERM `cat ${tmp}/*.pid | tr '\n' ' '` 2> /dev/null 3.21 + wait 3.22 + echo Interrupt complete! 3.23 + fi 3.24 fi 3.25 rm -f -r ${tmp} 3.26 exit 1 3.27 } 3.28 3.29 nice_exit () { 3.30 - if [ -d ${tmp} ]; then 3.31 - if [ "`ls ${tmp}`" != "" ]; then 3.32 - wait 3.33 - fi 3.34 + if [ -d ${tmp} ]; then 3.35 + if [ "`ls ${tmp}`" != "" ]; then 3.36 + wait 3.37 + fi 3.38 fi 3.39 rm -f -r ${tmp} 3.40 } 3.41 3.42 trap 'safe_interrupt' INT QUIT 3.43 trap 'nice_exit' EXIT 3.44 - 3.45 + 3.46 # Only look in specific locations for possible forests (avoids long searches) 3.47 pull_default="" 3.48 repos="" 3.49 @@ -172,14 +172,26 @@ 3.50 if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then 3.51 pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`" 3.52 echo ${hg} clone ${pull_newrepo} ${i} 3.53 - ${hg} clone ${pull_newrepo} ${i} & 3.54 + path="`dirname ${i}`" 3.55 + if [ "${path}" != "." ] ; then 3.56 + times=0 3.57 + while [ ! -d "${path}" ] ## nested repo, ensure containing dir exists 3.58 + do 3.59 + times=`expr ${times} '+' 1` 3.60 + if [ `expr ${times} '%' 10` -eq 0 ] ; then 3.61 + echo ${path} still not created, waiting... 3.62 + fi 3.63 + sleep 5 3.64 + done 3.65 + fi 3.66 + (${hg} clone ${pull_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc )& 3.67 else 3.68 echo "cd ${i} && ${hg} $*" 3.69 - cd ${i} && ${hg} "$@" & 3.70 - fi 3.71 + cd ${i} && (${hg} "$@"; echo "$?" > ${tmp}/${repopidfile}.pid.rc )& 3.72 + fi 3.73 echo $! > ${tmp}/${repopidfile}.pid 3.74 ) 2>&1 | sed -e "s@^@${reponame}: @") & 3.75 - 3.76 + 3.77 if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then 3.78 sleep 2 3.79 echo Waiting 5 secs before spawning next background command. 3.80 @@ -189,6 +201,15 @@ 3.81 # Wait for all hg commands to complete 3.82 wait 3.83 3.84 -# Terminate with exit 0 all the time (hard to know when to say "failed") 3.85 -exit 0 3.86 - 3.87 +# Terminate with exit 0 only if all subprocesses were successful 3.88 +ec=0 3.89 +if [ -d ${tmp} ]; then 3.90 + for rc in ${tmp}/*.pid.rc ; do 3.91 + exit_code=`cat ${rc} | tr -d ' \n\r'` 3.92 + if [ "${exit_code}" != "0" ] ; then 3.93 + echo "WARNING: ${rc} exited abnormally." 3.94 + ec=1 3.95 + fi 3.96 + done 3.97 +fi 3.98 +exit ${ec}
4.1 --- a/common/makefiles/JavaCompilation.gmk Mon Feb 04 18:08:42 2013 -0500 4.2 +++ b/common/makefiles/JavaCompilation.gmk Sun Feb 17 16:44:28 2013 -0500 4.3 @@ -143,8 +143,8 @@ 4.4 ifneq (,$2) 4.5 $1_DEPS:=$2 4.6 else 4.7 - $1_DEPS:=$$(filter $$(addprefix %,$$($1_FIND_PATTERNS)),\ 4.8 - $$(call CacheFind $$($1_SRCS))) 4.9 + $1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)),\ 4.10 + $$(call CacheFind,$$($1_SRCS))) 4.11 ifneq (,$$($1_GREP_INCLUDE_PATTERNS)) 4.12 $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS)) 4.13 endif
5.1 --- a/common/makefiles/Jprt.gmk Mon Feb 04 18:08:42 2013 -0500 5.2 +++ b/common/makefiles/Jprt.gmk Sun Feb 17 16:44:28 2013 -0500 5.3 @@ -179,27 +179,52 @@ 5.4 $(JPRT_ARCHIVE_BUNDLE): bundles 5.5 $(MKDIR) -p $(@D) 5.6 $(RM) $@ 5.7 - $(CP) $(BUILD_OUTPUT)/bundles/j2sdk-image.zip $@ 5.8 + $(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@ 5.9 5.10 -# This target must be called in the context of a SPEC file 5.11 -bundles: all 5.12 +ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) 5.13 + SRC_JDK_IMAGE_DIR := $(JDK_OVERLAY_IMAGE_DIR) 5.14 + SRC_JRE_IMAGE_DIR := $(JRE_OVERLAY_IMAGE_DIR) 5.15 +else 5.16 + SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR) 5.17 + SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR) 5.18 +endif 5.19 +SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR) 5.20 +SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR) 5.21 + 5.22 +# Bundle up the images 5.23 +bundles: all bundles-only 5.24 +bundles-only: start-make 5.25 @$(call TargetEnter) 5.26 $(MKDIR) -p $(BUILD_OUTPUT)/bundles 5.27 -ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) 5.28 - $(CD) $(JDK_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . 5.29 - $(CD) $(JRE_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . 5.30 -else 5.31 - $(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . 5.32 - $(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . 5.33 + $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip . 5.34 + $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip . 5.35 if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ 5.36 $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ 5.37 fi 5.38 + @$(call TargetExit) 5.39 + 5.40 +# Copy images to one unified location regardless of platform etc. 5.41 +final-images: all final-images-only 5.42 +final-images-only: start-make 5.43 + @$(call TargetEnter) 5.44 + $(RM) -r $(BUILD_OUTPUT)/final-images 5.45 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR) 5.46 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR) 5.47 + $(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/ 5.48 + $(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/ 5.49 +ifeq ($(OPENJDK_TARGET_OS),macosx) 5.50 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR) 5.51 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR) 5.52 + $(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/ 5.53 + $(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/ 5.54 endif 5.55 @$(call TargetExit) 5.56 5.57 + 5.58 # Keep track of phony targets 5.59 PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \ 5.60 - jprt_build_generic bundles jprt_bundle 5.61 + jprt_build_generic bundles jprt_bundle \ 5.62 + final-images final-images-only 5.63 5.64 ########################################################################### 5.65 # Phony targets
6.1 --- a/common/makefiles/Main.gmk Mon Feb 04 18:08:42 2013 -0500 6.2 +++ b/common/makefiles/Main.gmk Sun Feb 17 16:44:28 2013 -0500 6.3 @@ -75,7 +75,14 @@ 6.4 all: overlay-images 6.5 endif 6.6 6.7 -start-make: 6.8 +# Setup a rule for SPEC file that fails if executed. This check makes sure the configuration 6.9 +# is up to date after changes to configure 6.10 +$(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*) 6.11 + @$(ECHO) ERROR: $(SPEC) is not up to date 6.12 + @$(ECHO) Please rerun configure! 6.13 + @if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi 6.14 + 6.15 +start-make: $(SPEC) 6.16 @$(call AtMakeStart) 6.17 6.18 langtools: langtools-only 6.19 @@ -173,7 +180,7 @@ 6.20 6.21 test: start-make 6.22 @$(call TargetEnter) 6.23 - @($(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 6.24 + @($(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 6.25 @$(call TargetExit) 6.26 6.27 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be
7.1 --- a/common/makefiles/javadoc/CORE_PKGS.gmk Mon Feb 04 18:08:42 2013 -0500 7.2 +++ b/common/makefiles/javadoc/CORE_PKGS.gmk Sun Feb 17 16:44:28 2013 -0500 7.3 @@ -128,9 +128,9 @@ 7.4 java.text \ 7.5 java.text.spi \ 7.6 java.time \ 7.7 + java.time.chrono \ 7.8 + java.time.format \ 7.9 java.time.temporal \ 7.10 - java.time.calendar \ 7.11 - java.time.format \ 7.12 java.time.zone \ 7.13 java.util \ 7.14 java.util.concurrent \
8.1 --- a/get_source.sh Mon Feb 04 18:08:42 2013 -0500 8.2 +++ b/get_source.sh Sun Feb 17 16:44:28 2013 -0500 8.3 @@ -26,7 +26,7 @@ 8.4 # 8.5 8.6 # Get clones of all nested repositories 8.7 -sh ./common/bin/hgforest.sh clone "$@" 8.8 +sh ./common/bin/hgforest.sh clone "$@" || exit 1 8.9 8.10 # Update all existing repositories to the latest sources 8.11 sh ./common/bin/hgforest.sh pull -u
9.1 --- a/make/scripts/webrev.ksh Mon Feb 04 18:08:42 2013 -0500 9.2 +++ b/make/scripts/webrev.ksh Sun Feb 17 16:44:28 2013 -0500 9.3 @@ -19,7 +19,7 @@ 9.4 # 9.5 # CDDL HEADER END 9.6 # 9.7 -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. 9.8 +# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. 9.9 # Use is subject to license terms. 9.10 # 9.11 # This script takes a file list and a workspace and builds a set of html files 9.12 @@ -27,7 +27,7 @@ 9.13 # Documentation is available via 'webrev -h'. 9.14 # 9.15 9.16 -WEBREV_UPDATED=23.18-hg 9.17 +WEBREV_UPDATED=23.18-hg+jbs 9.18 9.19 HTML='<?xml version="1.0"?> 9.20 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 9.21 @@ -146,7 +146,7 @@ 9.22 # 9.23 bug2url() 9.24 { 9.25 - sed -e 's|[0-9]\{5,\}|<a href=\"'$BUGURL'&\">&</a>|g' 9.26 + sed -e 's|[0-9]\{5,\}|<a href=\"'$BUGURL$IDPREFIX'&\">&</a>|g' 9.27 } 9.28 9.29 # 9.30 @@ -230,8 +230,8 @@ 9.31 # $ sdiff_to_html old/usr/src/tools/scripts/webrev.sh \ 9.32 # new/usr/src/tools/scripts/webrev.sh \ 9.33 # webrev.sh usr/src/tools/scripts \ 9.34 -# '<a href="http://monaco.sfbay.sun.com/detail.jsp?cr=1234567"> 9.35 -# 1234567</a> my bugid' > <file>.html 9.36 +# '<a href="https://jbs.oracle.com/bugs/browse/JDK-1234567"> 9.37 +# JDK-1234567</a> my bugid' > <file>.html 9.38 # 9.39 # framed_sdiff() is then called which creates $2.frames.html 9.40 # in the webrev tree. 9.41 @@ -1160,7 +1160,7 @@ 9.42 print "$comm" 9.43 return 9.44 fi 9.45 - 9.46 + 9.47 print "$comm" | html_quote | bug2url | sac2url 9.48 ) 9.49 fi 9.50 @@ -1418,7 +1418,7 @@ 9.51 next;} 9.52 END {for (tree in trees) 9.53 { rev=revs[trees[tree]]; 9.54 - if (rev > 0) 9.55 + if (rev > 0) 9.56 {printf("%s %d\n",trees[tree],rev-1)} 9.57 }}' | while read LINE 9.58 do 9.59 @@ -1459,7 +1459,7 @@ 9.60 { 9.61 TREE=$1 9.62 HGCMD="hg -R $CWS/$TREE status $FSTAT_OPT" 9.63 - 9.64 + 9.65 $HGCMD -mdn 2>/dev/null | $FILTER | while read F 9.66 do 9.67 echo $TREE/$F 9.68 @@ -1543,7 +1543,7 @@ 9.69 if (n == 0) 9.70 { printf("A %s/%s\n",tree,$2)} 9.71 else 9.72 - { printf("A %s\n",$2)}; 9.73 + { printf("A %s\n",$2)}; 9.74 next} 9.75 /^ / {n=index($1,tree); 9.76 if (n == 0) 9.77 @@ -1604,7 +1604,7 @@ 9.78 # We need at least one of default-push or default paths set in .hg/hgrc 9.79 # If neither are set we don't know who to compare with. 9.80 9.81 -function flist_from_mercurial 9.82 +function flist_from_mercurial 9.83 { 9.84 # if [ "${PWS##ssh://}" != "$PWS" -o \ 9.85 # "${PWS##http://}" != "$PWS" -o \ 9.86 @@ -1757,7 +1757,7 @@ 9.87 elif [[ "$OS" == "Linux" ]]; then 9.88 DEVTOOLS="/java/devtools/linux/bin" 9.89 fi 9.90 - 9.91 + 9.92 ppath=$PATH 9.93 ppath=$ppath:/usr/sfw/bin:/usr/bin:/usr/sbin 9.94 ppath=$ppath:/opt/teamware/bin:/opt/onbld/bin 9.95 @@ -1844,7 +1844,7 @@ 9.96 ssh_host=`echo $CMD | sed -e 's/ssh:\/\/\([^/]*\)\/.*/\1/'` 9.97 ssh_dir=`echo $CMD | sed -e 's/ssh:\/\/[^/]*\/\(.*\)/\1/'` 9.98 fi 9.99 - 9.100 + 9.101 } 9.102 9.103 function build_old_new_mercurial 9.104 @@ -2096,7 +2096,7 @@ 9.105 PARENT_REV=$OPTARG;; 9.106 9.107 v) print "$0 version: $WEBREV_UPDATED";; 9.108 - 9.109 + 9.110 9.111 ?) usage;; 9.112 esac 9.113 @@ -2338,7 +2338,7 @@ 9.114 # 9.115 [[ -z $codemgr_ws && -n $CODEMGR_WS ]] && codemgr_ws=$CODEMGR_WS 9.116 [[ -z $codemgr_ws && -n $WSPACE ]] && codemgr_ws=`$WSPACE name` 9.117 - 9.118 + 9.119 if [[ -n $codemgr_ws && ! -d $codemgr_ws ]]; then 9.120 print -u2 "$codemgr_ws: no such workspace" 9.121 exit 1 9.122 @@ -2521,10 +2521,16 @@ 9.123 # Bug IDs will be replaced by a URL. Order of precedence 9.124 # is: default location, $WEBREV_BUGURL, the -O flag. 9.125 # 9.126 -BUGURL='http://monaco.sfbay.sun.com/detail.jsp?cr=' 9.127 +BUGURL='https://jbs.oracle.com/bugs/browse/' 9.128 [[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL" 9.129 -[[ -n "$Oflag" ]] && \ 9.130 +if [[ -n "$Oflag" ]]; then 9.131 + CRID=`echo $CRID | sed -e 's/JDK-//'` 9.132 BUGURL='http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=' 9.133 + IDPREFIX='' 9.134 +else 9.135 + IDPREFIX='JDK-' 9.136 +fi 9.137 + 9.138 9.139 # 9.140 # Likewise, ARC cases will be replaced by a URL. Order of precedence 9.141 @@ -2561,7 +2567,7 @@ 9.142 9.143 # 9.144 # Should we ignore changes in white spaces when generating diffs? 9.145 -# 9.146 +# 9.147 if [[ -n $bflag ]]; then 9.148 DIFFOPTS="-t" 9.149 else 9.150 @@ -2748,7 +2754,7 @@ 9.151 fi 9.152 fi 9.153 else 9.154 - 9.155 + 9.156 # 9.157 # If we have old and new versions of the file then run the 9.158 # appropriate diffs. This is complicated by a couple of factors: 9.159 @@ -3000,22 +3006,31 @@ 9.160 # external URL has a <title> like: 9.161 # <title>Bug ID: 6641309 Wrong Cookie separator used in HttpURLConnection</title> 9.162 # while internal URL has <title> like: 9.163 -# <title>6641309: Wrong Cookie separator used in HttpURLConnection</title> 9.164 +# <title>[#JDK-6641309] Wrong Cookie separator used in HttpURLConnection</title> 9.165 # 9.166 if [[ -n $CRID ]]; then 9.167 for id in $CRID 9.168 do 9.169 + if [[ -z "$Oflag" ]]; then 9.170 + #add "JDK-" to raw bug id for jbs links. 9.171 + id=`echo ${id} | sed 's/^\([0-9]\{5,\}\)$/JDK-\1/'` 9.172 + fi 9.173 print "<tr><th>Bug id:</th><td>" 9.174 url="${BUGURL}${id}" 9.175 + if [[ -n "$Oflag" ]]; then 9.176 + cleanup='s/Bug ID: \([0-9]\{5,\}\) \(.*\)/JDK-\1 : \2/' 9.177 + else 9.178 + cleanup='s|\[#\(JDK-[0-9]\{5,\}\)\] \(.*\)|\1 : \2|' 9.179 + fi 9.180 if [[ -n $WGET ]]; then 9.181 - msg=`$WGET -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed 's/Bug ID://'` 9.182 + msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup"` 9.183 fi 9.184 - if [[ -n $msg ]]; then 9.185 - print "<a href=\"$url\">$msg</a>" 9.186 - else 9.187 - print $id | bug2url 9.188 + if [[ -z $msg ]]; then 9.189 + msg="${id}" 9.190 fi 9.191 - 9.192 + 9.193 + print "<a href=\"$url\">$msg</a>" 9.194 + 9.195 print "</td></tr>" 9.196 done 9.197 fi 9.198 @@ -3179,4 +3194,3 @@ 9.199 9.200 print "Done." 9.201 print "Output to: $WDIR" 9.202 -
10.1 --- a/test/Makefile Mon Feb 04 18:08:42 2013 -0500 10.2 +++ b/test/Makefile Sun Feb 17 16:44:28 2013 -0500 10.3 @@ -38,8 +38,8 @@ 10.4 define SUBDIR_TEST # subdirectory target 10.5 if [ -d $1 ] ; then \ 10.6 if [ -r $1/test/Makefile ] ; then \ 10.7 - echo "$(MAKE) -C $1/test $2" ; \ 10.8 - $(MAKE) -C $1/test $2 ; \ 10.9 + echo "$(MAKE) -k -C $1/test $2" ; \ 10.10 + $(MAKE) -k -C $1/test $2 ; \ 10.11 else \ 10.12 echo "ERROR: File does not exist: $1/test/Makefile"; \ 10.13 exit 1; \ 10.14 @@ -53,7 +53,7 @@ 10.15 LANGTOOLS_TEST_LIST = langtools_jtreg 10.16 10.17 # Test target list for jdk repository 10.18 -JDK_DEFAULT_TEST_LIST = \ 10.19 +JDK_ALL_TEST_LIST = \ 10.20 jdk_beans1 \ 10.21 jdk_io \ 10.22 jdk_lang \ 10.23 @@ -64,10 +64,7 @@ 10.24 jdk_security1 \ 10.25 jdk_text \ 10.26 jdk_util \ 10.27 - jdk_time 10.28 - 10.29 -# These tests are not part of the default testing list 10.30 -JDK_NONDEFAULT_TEST_LIST = \ 10.31 + jdk_time \ 10.32 jdk_awt \ 10.33 jdk_beans2 jdk_beans3 \ 10.34 jdk_management \ 10.35 @@ -80,14 +77,14 @@ 10.36 jdk_jdi \ 10.37 jdk_jfr 10.38 10.39 -# All jdk tests 10.40 -JDK_ALL_TEST_LIST = $(JDK_DEFAULT_TEST_LIST) $(JDK_NONDEFAULT_TEST_LIST) 10.41 +# Theses are meta test targets in jdk 10.42 +JDK_META_TEST_LIST = jdk_all jdk_default jdk_core 10.43 10.44 # These are the current jck test targets in the jdk repository 10.45 JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime 10.46 10.47 -# Default test target (everything) 10.48 -default: $(JDK_DEFAULT_TEST_LIST) $(LANGTOOLS_TEST_LIST) 10.49 +# Default test target (core) 10.50 +default: jdk_core $(LANGTOOLS_TEST_LIST) 10.51 10.52 # All testing 10.53 all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST) 10.54 @@ -95,7 +92,8 @@ 10.55 # Test targets 10.56 $(LANGTOOLS_TEST_LIST): 10.57 @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) 10.58 -$(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST): 10.59 + 10.60 +$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST): 10.61 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) 10.62 10.63 clean: 10.64 @@ -104,7 +102,7 @@ 10.65 10.66 # Phony targets (e.g. these are not filenames) 10.67 .PHONY: all clean \ 10.68 - $(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST) \ 10.69 + $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \ 10.70 $(LANGTOOLS_TEST_LIST) 10.71 10.72 ################################################################
