Mercurial > jdk8-mips64-public > langtools / changeset
changeset
Merge
Sat, 09 Nov 2019 20:29:44 +0800
- author
- aoqi
- date
- Sat, 09 Nov 2019 20:29:44 +0800
- changeset 3846
- 1a713bbdb09e
- parent 3828
- c9a7e1d48ac3
- parent 3845
- 735048c9f2d6
- child 3847
- 4e460711b506
Merge
| .hgtags | file | annotate | diff | comparison | revisions | |
| THIRD_PARTY_README | file | annotate | diff | comparison | revisions | |
| test/Makefile | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Sat Nov 09 20:15:27 2019 +0800 1.2 +++ b/.hgtags Sat Nov 09 20:29:44 2019 +0800 1.3 @@ -1021,6 +1021,17 @@ 1.4 563e06335c252222c825a1fd67425b99581dbac2 jdk8u222-b06 1.5 1b641cb01496dfa3d13b7587e76b22d76bfe51c6 jdk8u222-b07 1.6 e5ee6728508d72b987758116d9b0a23e4f3830c1 jdk8u222-b08 1.7 +2ad39b194cc1b7fa1f368b044e86f43a2b6552b1 jdk8u232-b00 1.8 6aa4f05982eb70dc746f84a152c4e5e0b4a7261e jdk8u222-b09 1.9 +32df4483e2e387a85688bad69c398dc4c7bc2cfa jdk8u222-b10 1.10 +32df4483e2e387a85688bad69c398dc4c7bc2cfa jdk8u222-ga 1.11 3fdfb200c295bc494caeb1d92eb4a03287bbe892 mips64el-jdk8u222-b11 1.12 6e8ada32365ddcec34274a94c5a8843fcf49e24a mips64el-jdk8u222-b12 1.13 +d859443cacf81207f0879e9f21810b102afdb240 jdk8u232-b01 1.14 +19908109cb37637cebab5d6e9cc6c151836cbc27 jdk8u232-b02 1.15 +671c4ba50c6f4f9780d40de2549d91f15fcb88d1 jdk8u232-b03 1.16 +3de2732a8241c8c85a85942f7341ad48491976d9 jdk8u232-b04 1.17 +415c49110391d46dbb9be24154c2ad1b4157790a jdk8u232-b05 1.18 +dd568d0e5e10a0dfc05ace7f16bbac5ad6eddde5 jdk8u232-b06 1.19 +3b3a43588afb9fbdb1b95c475a11d3529a3d9cb5 jdk8u232-b07 1.20 +4bc16c3608302128648e92c80f3b396372471383 jdk8u232-b08
2.1 --- a/THIRD_PARTY_README Sat Nov 09 20:15:27 2019 +0800 2.2 +++ b/THIRD_PARTY_README Sat Nov 09 20:29:44 2019 +0800 2.3 @@ -1470,60 +1470,90 @@ 2.4 2.5 ------------------------------------------------------------------------------- 2.6 2.7 -%% This notice is provided with respect to libpng 1.6.35, which may be 2.8 +%% This notice is provided with respect to libpng 1.6.37, which may be 2.9 included with JRE 8, JDK 8, and OpenJDK 8. 2.10 2.11 --- begin of LICENSE --- 2.12 2.13 -This copy of the libpng notices is provided for your convenience. In case of 2.14 -any discrepancy between this copy and the notices in the file png.h that is 2.15 -included in the libpng distribution, the latter shall prevail. 2.16 - 2.17 -COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: 2.18 - 2.19 -If you modify libpng you may insert additional notices immediately following 2.20 -this sentence. 2.21 - 2.22 -This code is released under the libpng license. 2.23 - 2.24 -libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are 2.25 +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE 2.26 +========================================= 2.27 + 2.28 +PNG Reference Library License version 2 2.29 +--------------------------------------- 2.30 + 2.31 + * Copyright (c) 1995-2019 The PNG Reference Library Authors. 2.32 + * Copyright (c) 2018-2019 Cosmin Truta. 2.33 + * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. 2.34 + * Copyright (c) 1996-1997 Andreas Dilger. 2.35 + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. 2.36 + 2.37 +The software is supplied "as is", without warranty of any kind, 2.38 +express or implied, including, without limitation, the warranties 2.39 +of merchantability, fitness for a particular purpose, title, and 2.40 +non-infringement. In no event shall the Copyright owners, or 2.41 +anyone distributing the software, be liable for any damages or 2.42 +other liability, whether in contract, tort or otherwise, arising 2.43 +from, out of, or in connection with the software, or the use or 2.44 +other dealings in the software, even if advised of the possibility 2.45 +of such damage. 2.46 + 2.47 +Permission is hereby granted to use, copy, modify, and distribute 2.48 +this software, or portions hereof, for any purpose, without fee, 2.49 +subject to the following restrictions: 2.50 + 2.51 + 1. The origin of this software must not be misrepresented; you 2.52 + must not claim that you wrote the original software. If you 2.53 + use this software in a product, an acknowledgment in the product 2.54 + documentation would be appreciated, but is not required. 2.55 + 2.56 + 2. Altered source versions must be plainly marked as such, and must 2.57 + not be misrepresented as being the original software. 2.58 + 2.59 + 3. This Copyright notice may not be removed or altered from any 2.60 + source or altered source distribution. 2.61 + 2.62 + 2.63 +PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35) 2.64 +----------------------------------------------------------------------- 2.65 + 2.66 +libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are 2.67 Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are 2.68 derived from libpng-1.0.6, and are distributed according to the same 2.69 disclaimer and license as libpng-1.0.6 with the following individuals 2.70 added to the list of Contributing Authors: 2.71 2.72 - Simon-Pierre Cadieux 2.73 - Eric S. Raymond 2.74 - Mans Rullgard 2.75 - Cosmin Truta 2.76 - Gilles Vollant 2.77 - James Yu 2.78 - Mandar Sahastrabuddhe 2.79 - Google Inc. 2.80 - Vadim Barkov 2.81 + Simon-Pierre Cadieux 2.82 + Eric S. Raymond 2.83 + Mans Rullgard 2.84 + Cosmin Truta 2.85 + Gilles Vollant 2.86 + James Yu 2.87 + Mandar Sahastrabuddhe 2.88 + Google Inc. 2.89 + Vadim Barkov 2.90 2.91 and with the following additions to the disclaimer: 2.92 2.93 - There is no warranty against interference with your enjoyment of the 2.94 - library or against infringement. There is no warranty that our 2.95 - efforts or the library will fulfill any of your particular purposes 2.96 - or needs. This library is provided with all faults, and the entire 2.97 - risk of satisfactory quality, performance, accuracy, and effort is with 2.98 - the user. 2.99 + There is no warranty against interference with your enjoyment of 2.100 + the library or against infringement. There is no warranty that our 2.101 + efforts or the library will fulfill any of your particular purposes 2.102 + or needs. This library is provided with all faults, and the entire 2.103 + risk of satisfactory quality, performance, accuracy, and effort is 2.104 + with the user. 2.105 2.106 Some files in the "contrib" directory and some configure-generated 2.107 -files that are distributed with libpng have other copyright owners and 2.108 +files that are distributed with libpng have other copyright owners, and 2.109 are released under other open source licenses. 2.110 2.111 libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are 2.112 Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from 2.113 libpng-0.96, and are distributed according to the same disclaimer and 2.114 -license as libpng-0.96, with the following individuals added to the list 2.115 -of Contributing Authors: 2.116 - 2.117 - Tom Lane 2.118 - Glenn Randers-Pehrson 2.119 - Willem van Schaik 2.120 +license as libpng-0.96, with the following individuals added to the 2.121 +list of Contributing Authors: 2.122 + 2.123 + Tom Lane 2.124 + Glenn Randers-Pehrson 2.125 + Willem van Schaik 2.126 2.127 libpng versions 0.89, June 1996, through 0.96, May 1997, are 2.128 Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, 2.129 @@ -1531,14 +1561,14 @@ 2.130 libpng-0.88, with the following individuals added to the list of 2.131 Contributing Authors: 2.132 2.133 - John Bowler 2.134 - Kevin Bracey 2.135 - Sam Bushell 2.136 - Magnus Holmgren 2.137 - Greg Roelofs 2.138 - Tom Tanner 2.139 - 2.140 -Some files in the "scripts" directory have other copyright owners 2.141 + John Bowler 2.142 + Kevin Bracey 2.143 + Sam Bushell 2.144 + Magnus Holmgren 2.145 + Greg Roelofs 2.146 + Tom Tanner 2.147 + 2.148 +Some files in the "scripts" directory have other copyright owners, 2.149 but are released under this license. 2.150 2.151 libpng versions 0.5, May 1995, through 0.88, January 1996, are 2.152 @@ -1547,39 +1577,38 @@ 2.153 For the purposes of this copyright and license, "Contributing Authors" 2.154 is defined as the following set of individuals: 2.155 2.156 - Andreas Dilger 2.157 - Dave Martindale 2.158 - Guy Eric Schalnat 2.159 - Paul Schmidt 2.160 - Tim Wegner 2.161 - 2.162 -The PNG Reference Library is supplied "AS IS". The Contributing Authors 2.163 -and Group 42, Inc. disclaim all warranties, expressed or implied, 2.164 -including, without limitation, the warranties of merchantability and of 2.165 -fitness for any purpose. The Contributing Authors and Group 42, Inc. 2.166 -assume no liability for direct, indirect, incidental, special, exemplary, 2.167 -or consequential damages, which may result from the use of the PNG 2.168 -Reference Library, even if advised of the possibility of such damage. 2.169 + Andreas Dilger 2.170 + Dave Martindale 2.171 + Guy Eric Schalnat 2.172 + Paul Schmidt 2.173 + Tim Wegner 2.174 + 2.175 +The PNG Reference Library is supplied "AS IS". The Contributing 2.176 +Authors and Group 42, Inc. disclaim all warranties, expressed or 2.177 +implied, including, without limitation, the warranties of 2.178 +merchantability and of fitness for any purpose. The Contributing 2.179 +Authors and Group 42, Inc. assume no liability for direct, indirect, 2.180 +incidental, special, exemplary, or consequential damages, which may 2.181 +result from the use of the PNG Reference Library, even if advised of 2.182 +the possibility of such damage. 2.183 2.184 Permission is hereby granted to use, copy, modify, and distribute this 2.185 source code, or portions hereof, for any purpose, without fee, subject 2.186 to the following restrictions: 2.187 2.188 - 1. The origin of this source code must not be misrepresented. 2.189 - 2.190 - 2. Altered versions must be plainly marked as such and must not 2.191 - be misrepresented as being the original source. 2.192 - 2.193 - 3. This Copyright notice may not be removed or altered from any 2.194 - source or altered source distribution. 2.195 - 2.196 -The Contributing Authors and Group 42, Inc. specifically permit, without 2.197 -fee, and encourage the use of this source code as a component to 2.198 -supporting the PNG file format in commercial products. If you use this 2.199 -source code in a product, acknowledgment is not required but would be 2.200 -appreciated. 2.201 - 2.202 -END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. 2.203 + 1. The origin of this source code must not be misrepresented. 2.204 + 2.205 + 2. Altered versions must be plainly marked as such and must not 2.206 + be misrepresented as being the original source. 2.207 + 2.208 + 3. This Copyright notice may not be removed or altered from any 2.209 + source or altered source distribution. 2.210 + 2.211 +The Contributing Authors and Group 42, Inc. specifically permit, 2.212 +without fee, and encourage the use of this source code as a component 2.213 +to supporting the PNG file format in commercial products. If you use 2.214 +this source code in a product, acknowledgment is not required but would 2.215 +be appreciated. 2.216 2.217 TRADEMARK: 2.218 2.219 @@ -2101,13 +2130,13 @@ 2.220 2.221 ------------------------------------------------------------------------------- 2.222 2.223 -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, 2.224 +%% This notice is provided with respect to PC/SC Lite v1.8.24, 2.225 which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. 2.226 2.227 --- begin of LICENSE --- 2.228 2.229 -Copyright (c) 1999-2004 David Corcoran <corcoran@linuxnet.com> 2.230 -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr> 2.231 +Copyright (c) 1999-2003 David Corcoran <corcoran@linuxnet.com> 2.232 +Copyright (c) 2001-2011 Ludovic Rousseau <ludovic.rousseau@free.fr> 2.233 All rights reserved. 2.234 2.235 Redistribution and use in source and binary forms, with or without 2.236 @@ -2119,15 +2148,10 @@ 2.237 2. Redistributions in binary form must reproduce the above copyright 2.238 notice, this list of conditions and the following disclaimer in the 2.239 documentation and/or other materials provided with the distribution. 2.240 -3. All advertising materials mentioning features or use of this software 2.241 - must display the following acknowledgement: 2.242 - This product includes software developed by: 2.243 - David Corcoran <corcoran@linuxnet.com> 2.244 - http://www.linuxnet.com (MUSCLE) 2.245 -4. The name of the author may not be used to endorse or promote products 2.246 +3. The name of the author may not be used to endorse or promote products 2.247 derived from this software without specific prior written permission. 2.248 2.249 -Changes to this license can be made only by the copyright author with 2.250 +Changes to this license can be made only by the copyright author with 2.251 explicit written consent. 2.252 2.253 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
3.1 --- a/src/share/classes/com/sun/tools/javadoc/JavaScriptScanner.java Sat Nov 09 20:15:27 2019 +0800 3.2 +++ b/src/share/classes/com/sun/tools/javadoc/JavaScriptScanner.java Sat Nov 09 20:29:44 2019 +0800 3.3 @@ -68,12 +68,10 @@ 3.4 private boolean newline = true; 3.5 3.6 Map<String, TagParser> tagParsers; 3.7 - Set<String> eventAttrs; 3.8 Set<String> uriAttrs; 3.9 3.10 public JavaScriptScanner() { 3.11 initTagParsers(); 3.12 - initEventAttrs(); 3.13 initURIAttrs(); 3.14 } 3.15 3.16 @@ -100,7 +98,11 @@ 3.17 3.18 private void checkHtmlAttr(String name, String value) { 3.19 String n = name.toLowerCase(Locale.ENGLISH); 3.20 - if (eventAttrs.contains(n) 3.21 + // https://www.w3.org/TR/html52/fullindex.html#attributes-table 3.22 + // See https://www.w3.org/TR/html52/webappapis.html#events-event-handlers 3.23 + // An event handler has a name, which always starts with "on" and is followed by 3.24 + // the name of the event for which it is intended. 3.25 + if (n.startsWith("on") 3.26 || uriAttrs.contains(n) 3.27 && value != null && value.toLowerCase(Locale.ENGLISH).trim().startsWith("javascript:")) { 3.28 reporter.report(); 3.29 @@ -1060,34 +1062,6 @@ 3.30 3.31 } 3.32 3.33 - private void initEventAttrs() { 3.34 - eventAttrs = new HashSet<>(Arrays.asList( 3.35 - // See https://www.w3.org/TR/html-markup/global-attributes.html#common.attrs.event-handler 3.36 - "onabort", "onblur", "oncanplay", "oncanplaythrough", 3.37 - "onchange", "onclick", "oncontextmenu", "ondblclick", 3.38 - "ondrag", "ondragend", "ondragenter", "ondragleave", 3.39 - "ondragover", "ondragstart", "ondrop", "ondurationchange", 3.40 - "onemptied", "onended", "onerror", "onfocus", "oninput", 3.41 - "oninvalid", "onkeydown", "onkeypress", "onkeyup", 3.42 - "onload", "onloadeddata", "onloadedmetadata", "onloadstart", 3.43 - "onmousedown", "onmousemove", "onmouseout", "onmouseover", 3.44 - "onmouseup", "onmousewheel", "onpause", "onplay", 3.45 - "onplaying", "onprogress", "onratechange", "onreadystatechange", 3.46 - "onreset", "onscroll", "onseeked", "onseeking", 3.47 - "onselect", "onshow", "onstalled", "onsubmit", "onsuspend", 3.48 - "ontimeupdate", "onvolumechange", "onwaiting", 3.49 - 3.50 - // See https://www.w3.org/TR/html4/sgml/dtd.html 3.51 - // Most of the attributes that take a %Script are also defined as event handlers 3.52 - // in HTML 5. The one exception is onunload. 3.53 - // "onchange", "onclick", "ondblclick", "onfocus", 3.54 - // "onkeydown", "onkeypress", "onkeyup", "onload", 3.55 - // "onmousedown", "onmousemove", "onmouseout", "onmouseover", 3.56 - // "onmouseup", "onreset", "onselect", "onsubmit", 3.57 - "onunload" 3.58 - )); 3.59 - } 3.60 - 3.61 private void initURIAttrs() { 3.62 uriAttrs = new HashSet<>(Arrays.asList( 3.63 // See https://www.w3.org/TR/html4/sgml/dtd.html
4.1 --- a/test/Makefile Sat Nov 09 20:15:27 2019 +0800 4.2 +++ b/test/Makefile Sat Nov 09 20:29:44 2019 +0800 4.3 @@ -16,6 +16,44 @@ 4.4 # JPRT may invoke this Makefile directly, as part of a langtools build, 4.5 # or indirectly, via FOREST/test/Makefile, as part of a control build. 4.6 4.7 + 4.8 +# Utilities used 4.9 +AWK = awk 4.10 +CAT = cat 4.11 +CD = cd 4.12 +CHMOD = chmod 4.13 +CP = cp 4.14 +CUT = cut 4.15 +DIRNAME = dirname 4.16 +ECHO = echo 4.17 +EGREP = egrep 4.18 +EXPAND = expand 4.19 +FIND = find 4.20 +MKDIR = mkdir 4.21 +PWD = pwd 4.22 +SED = sed 4.23 +SORT = sort 4.24 +TEE = tee 4.25 +UNAME = uname 4.26 +UNIQ = uniq 4.27 +WC = wc 4.28 +ZIP = zip 4.29 + 4.30 +# Get OS name from uname (Cygwin inexplicably adds _NT-5.1) 4.31 +UNAME_S := $(shell $(UNAME) -s | $(CUT) -f1 -d_) 4.32 + 4.33 +# Commands to run on paths to make mixed paths for java on windows 4.34 +ifeq ($(UNAME_S), CYGWIN) 4.35 + # Location of developer shared files 4.36 + SLASH_JAVA = J: 4.37 + GETMIXEDPATH = cygpath -m 4.38 +else 4.39 + # Location of developer shared files 4.40 + SLASH_JAVA = /java 4.41 + 4.42 + GETMIXEDPATH=$(ECHO) 4.43 +endif 4.44 + 4.45 # Get OS/ARCH specifics 4.46 OSNAME = $(shell uname -s) 4.47 ifeq ($(OSNAME), SunOS) 4.48 @@ -183,7 +221,7 @@ 4.49 endif 4.50 4.51 # Default verbosity setting for jtreg 4.52 -JTREG_VERBOSE = fail,error,nopass 4.53 +JTREG_VERBOSE = fail,error,summary 4.54 4.55 # Default verbosity setting for jck 4.56 JCK_VERBOSE = non-pass 4.57 @@ -218,14 +256,16 @@ 4.58 4.59 # Root of all test results 4.60 TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools 4.61 -ABS_TEST_OUTPUT_DIR := \ 4.62 - $(shell mkdir -p $(TEST_OUTPUT_DIR); \ 4.63 - cd $(TEST_OUTPUT_DIR); \ 4.64 - pwd $(CYGPATH)) 4.65 +ifdef ALT_OUTPUTDIR 4.66 + ABS_OUTPUTDIR := $(shell cd $(ALT_OUTPUTDIR) && pwd $(CYGPATH)) 4.67 +else 4.68 + ABS_OUTPUTDIR := $(shell mkdir -p $(TEST_OUTPUT_DIR); cd $(TEST_OUTPUT_DIR) && pwd $(CYGPATH)) 4.69 +endif 4.70 +ABS_TEST_OUTPUT_DIR := $(ABS_OUTPUTDIR)/testoutput/$(UNIQUE_DIR) 4.71 # Subdirectories for different test runs 4.72 -JTREG_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jtreg 4.73 -JCK_COMPILER_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jck-compiler 4.74 -JCK_RUNTIME_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jck-runtime-Xcompile 4.75 +JTREG_OUTPUT_DIR = $(ABS_OUTPUTDIR)/jtreg 4.76 +JCK_COMPILER_OUTPUT_DIR = $(ABS_OUTPUTDIR)/jck-compiler 4.77 +JCK_RUNTIME_OUTPUT_DIR = $(ABS_OUTPUTDIR)/jck-runtime-Xcompile 4.78 4.79 # Default make rule -- warning, may take a while 4.80 all: $(JPRT_CLEAN) jtreg-tests jck-compiler-tests jck-runtime-tests $(JPRT_ARCHIVE_BUNDLE) all-summary 4.81 @@ -240,6 +280,8 @@ 4.82 jck-runtime: $(JPRT_CLEAN) jck-runtime-tests $(JPRT_ARCHIVE_BUNDLE) jck-runtime-summary 4.83 @echo "Testing completed successfully" 4.84 4.85 +tier1: jtreg-tests-tier1 4.86 + 4.87 # for use with JPRT -testrule 4.88 all: JTREG_TESTDIRS = . 4.89 jtreg: JTREG_TESTDIRS = . 4.90 @@ -305,7 +347,6 @@ 4.91 # Check to make sure these directories exist 4.92 check-jtreg: $(PRODUCT_HOME) $(JTREG) 4.93 4.94 - 4.95 # Run JCK-compiler tests 4.96 # 4.97 # JCK_HOME 4.98 @@ -434,11 +475,105 @@ 4.99 # Used to force a target rules to run 4.100 FRC: 4.101 4.102 +# 4.103 +# Tier 1 langtools testing logic 4.104 +# 4.105 + 4.106 +ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip 4.107 + 4.108 +# How to create the test bundle (pass or fail, we want to create this) 4.109 +# Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed. 4.110 +ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` \ 4.111 + && $(CD) $(ABS_TEST_OUTPUT_DIR) \ 4.112 + && $(CHMOD) -R a+r . \ 4.113 + && $(ZIP) -q -r $(ARCHIVE_BUNDLE) . ) 4.114 + 4.115 +# important results files 4.116 +SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport/text/summary.txt") 4.117 +STATS_TXT_NAME = Stats.txt 4.118 +STATS_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/$(STATS_TXT_NAME)") 4.119 +RUNLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/runlist.txt") 4.120 +PASSLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/passlist.txt") 4.121 +FAILLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/faillist.txt") 4.122 +EXITCODE = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/exitcode.txt") 4.123 + 4.124 +TESTEXIT = \ 4.125 + if [ ! -s $(EXITCODE) ] ; then \ 4.126 + $(ECHO) "ERROR: EXITCODE file not filled in."; \ 4.127 + $(ECHO) "1" > $(EXITCODE); \ 4.128 + fi ; \ 4.129 + testExitCode=`$(CAT) $(EXITCODE)`; \ 4.130 + $(ECHO) "EXIT CODE: $${testExitCode}"; \ 4.131 + exit $${testExitCode} 4.132 + 4.133 +BUNDLE_UP_AND_EXIT = \ 4.134 +( \ 4.135 + jtregExitCode=$$? && \ 4.136 + _summary="$(SUMMARY_TXT)"; \ 4.137 + $(RM) -f $(STATS_TXT) $(RUNLIST) $(PASSLIST) $(FAILLIST) $(EXITCODE); \ 4.138 + $(ECHO) "$${jtregExitCode}" > $(EXITCODE); \ 4.139 + if [ -r "$${_summary}" ] ; then \ 4.140 + $(ECHO) "Summary: $(UNIQUE_DIR)" > $(STATS_TXT); \ 4.141 + $(EXPAND) $${_summary} | $(EGREP) -v ' Not run\.' > $(RUNLIST); \ 4.142 + $(EGREP) ' Passed\.' $(RUNLIST) \ 4.143 + | $(EGREP) -v ' Error\.' \ 4.144 + | $(EGREP) -v ' Failed\.' > $(PASSLIST); \ 4.145 + ( $(EGREP) ' Failed\.' $(RUNLIST); \ 4.146 + $(EGREP) ' Error\.' $(RUNLIST); \ 4.147 + $(EGREP) -v ' Passed\.' $(RUNLIST) ) \ 4.148 + | $(SORT) | $(UNIQ) > $(FAILLIST); \ 4.149 + if [ $${jtregExitCode} != 0 -o -s $(FAILLIST) ] ; then \ 4.150 + $(EXPAND) $(FAILLIST) \ 4.151 + | $(CUT) -d' ' -f1 \ 4.152 + | $(SED) -e 's@^@FAILED: @' >> $(STATS_TXT); \ 4.153 + if [ $${jtregExitCode} = 0 ] ; then \ 4.154 + jtregExitCode=1; \ 4.155 + fi; \ 4.156 + fi; \ 4.157 + runc="`$(CAT) $(RUNLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ 4.158 + passc="`$(CAT) $(PASSLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ 4.159 + failc="`$(CAT) $(FAILLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ 4.160 + exclc="FIXME CODETOOLS-7900176"; \ 4.161 + $(ECHO) "TEST STATS: name=$(UNIQUE_DIR) run=$${runc} pass=$${passc} fail=$${failc}" \ 4.162 + >> $(STATS_TXT); \ 4.163 + else \ 4.164 + $(ECHO) "Missing file: $${_summary}" >> $(STATS_TXT); \ 4.165 + fi; \ 4.166 + if [ -f $(STATS_TXT) ] ; then \ 4.167 + $(CAT) $(STATS_TXT); \ 4.168 + fi; \ 4.169 + $(ZIP_UP_RESULTS) ; \ 4.170 + $(TESTEXIT) \ 4.171 +) 4.172 + 4.173 +prep-tier1: 4.174 + @$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR) 4.175 + 4.176 +# Run tier1 jtreg 4.177 +jtreg-tests-tier1: check-jtreg prep-tier1 FRC 4.178 + ( \ 4.179 + ( JT_HOME=$(shell $(GETMIXEDPATH) "$(JT_HOME)"); \ 4.180 + export JT_HOME; \ 4.181 + $(shell $(GETMIXEDPATH) "$(JTREG)") \ 4.182 + -J-Xmx512m \ 4.183 + -vmoption:-Xmx768m \ 4.184 + -a -ignore:quiet $(if $(JTREG_VERBOSE),-v:$(JTREG_VERBOSE)) \ 4.185 + -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport") \ 4.186 + -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTwork") \ 4.187 + -jdk:$(shell $(GETMIXEDPATH) "$(TESTJAVA)") \ 4.188 + $(JAVA_ARGS:%=-vmoption:%) \ 4.189 + $(JTREG_OPTIONS) \ 4.190 + :langtools_tier1 \ 4.191 + ) ; \ 4.192 + $(BUNDLE_UP_AND_EXIT) \ 4.193 + ) 2>&1 | $(TEE) $(ABS_TEST_OUTPUT_DIR)/output.txt ; $(TESTEXIT) 4.194 + 4.195 # Phony targets (e.g. these are not filenames) 4.196 .PHONY: all clean \ 4.197 jtreg javac javadoc javah javap jdeps jtreg-tests jtreg-summary check-jtreg \ 4.198 jck-compiler jck-compiler-tests jck-compiler-summary \ 4.199 - jck-runtime jck-runtime-tests jck-runtime-summary check-jck 4.200 + jck-runtime jck-runtime-tests jck-runtime-summary check-jck prep-tier1 \ 4.201 + jtreg-tests-tier1 tier1 4.202 4.203 # No use of suffix rules 4.204 .SUFFIXES:
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/test/ProblemList.txt Sat Nov 09 20:29:44 2019 +0800 5.3 @@ -0,0 +1,26 @@ 5.4 +########################################################################### 5.5 +# 5.6 +# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. 5.7 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.8 +# 5.9 +# This code is free software; you can redistribute it and/or modify it 5.10 +# under the terms of the GNU General Public License version 2 only, as 5.11 +# published by the Free Software Foundation. 5.12 +# 5.13 +# This code is distributed in the hope that it will be useful, but WITHOUT 5.14 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 5.15 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 5.16 +# version 2 for more details (a copy is included in the LICENSE file that 5.17 +# accompanied this code). 5.18 +# 5.19 +# You should have received a copy of the GNU General Public License version 5.20 +# 2 along with this work; if not, write to the Free Software Foundation, 5.21 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 5.22 +# 5.23 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 5.24 +# or visit www.oracle.com if you need additional information or have any 5.25 +# questions. 5.26 +# 5.27 +########################################################################### 5.28 + 5.29 +# No langtools tests are on the problem list.
6.1 --- a/test/TEST.ROOT Sat Nov 09 20:15:27 2019 +0800 6.2 +++ b/test/TEST.ROOT Sat Nov 09 20:29:44 2019 +0800 6.3 @@ -1,6 +1,18 @@ 6.4 # This file identifies the root of the test-suite hierarchy. 6.5 # It also contains test-suite configuration information. 6.6 -# DO NOT EDIT without first contacting jdk-regtest@sun.com. 6.7 6.8 -# The list of keywords supported in the entire test suite 6.9 -keys=2d dnd i18n 6.10 +# The list of keywords supported in the entire test suite. The 6.11 +# "intermittent" keyword marks tests known to fail intermittently. 6.12 +# The "randomness" keyword marks tests using randomness with test 6.13 +# cases differing from run to run. (A test using a fixed random seed 6.14 +# would not count as "randomness" by this definition.) Extra care 6.15 +# should be taken to handle test failures of intermittent or 6.16 +# randomness tests. 6.17 + 6.18 +keys=intermittent randomness 6.19 + 6.20 +# Group definitions 6.21 +groups=TEST.groups 6.22 + 6.23 +# Tests using jtreg 4.1 b11 features 6.24 +requiredVersion=4.1 b11
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/test/TEST.groups Sat Nov 09 20:29:44 2019 +0800 7.3 @@ -0,0 +1,32 @@ 7.4 +# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. 7.5 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 7.6 +# 7.7 +# This code is free software; you can redistribute it and/or modify it 7.8 +# under the terms of the GNU General Public License version 2 only, as 7.9 +# published by the Free Software Foundation. 7.10 +# 7.11 +# This code is distributed in the hope that it will be useful, but WITHOUT 7.12 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 7.13 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 7.14 +# version 2 for more details (a copy is included in the LICENSE file that 7.15 +# accompanied this code). 7.16 +# 7.17 +# You should have received a copy of the GNU General Public License version 7.18 +# 2 along with this work; if not, write to the Free Software Foundation, 7.19 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 7.20 +# 7.21 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 7.22 +# or visit www.oracle.com if you need additional information or have any 7.23 +# questions. 7.24 +# 7.25 + 7.26 +# Tiered testing definitions 7.27 + 7.28 +# All langtools tests are tier 1 7.29 +langtools_tier1 = \ 7.30 + tools \ 7.31 + com \ 7.32 + lib 7.33 + 7.34 +# No langtools tests are tier 2 7.35 +langtools_tier2 =
8.1 --- a/test/tools/javadoc/TestScriptInComment.java Sat Nov 09 20:15:27 2019 +0800 8.2 +++ b/test/tools/javadoc/TestScriptInComment.java Sat Nov 09 20:29:44 2019 +0800 8.3 @@ -25,7 +25,7 @@ 8.4 8.5 /** 8.6 * @test 8.7 - * @bug 8138725 8.8 + * @bug 8138725 8226765 8.9 * @summary test --allow-script-in-comments 8.10 * @run main TestScriptInComment 8.11 */ 8.12 @@ -65,6 +65,10 @@ 8.13 WS("< script >#ALERT</script>", false, "-Xdoclint:none"), // script tag with invalid white space 8.14 SA("<script src=\"file\"> #ALERT </script>", true), // script tag with an attribute 8.15 ON("<a onclick='#ALERT'>x</a>", true), // event handler attribute 8.16 + OME("<img alt='1' onmouseenter='#ALERT'>", true), // onmouseenter event handler attribute 8.17 + OML("<img alt='1' onmouseleave='#ALERT'>", true), // onmouseleave event handler attribute 8.18 + OFI("<a href='#' onfocusin='#ALERT'>x</a>", true), // onfocusin event handler attribute 8.19 + OBE("<a onbogusevent='#ALERT'>x</a>", true), // bogus/future event handler attribute 8.20 URI("<a href='javascript:#ALERT'>x</a>", true); // javadcript URI 8.21 8.22 /**
9.1 --- a/test/tools/javadoc/api/basic/GetTask_DocletClassTest.java Sat Nov 09 20:15:27 2019 +0800 9.2 +++ b/test/tools/javadoc/api/basic/GetTask_DocletClassTest.java Sat Nov 09 20:29:44 2019 +0800 9.3 @@ -27,6 +27,7 @@ 9.4 * @summary javadoc should have a javax.tools.Tool service provider 9.5 * @build APITest 9.6 * @run main GetTask_DocletClassTest 9.7 + * @key randomness 9.8 */ 9.9 9.10 import com.sun.javadoc.DocErrorReporter;
