Mercurial > hg > release > icedtea7-forest-2.3 > langtools
changeset 1438:f5971bf5bc5e
Merge jdk7u25-b16
author | andrew |
---|---|
date | Thu, 08 Aug 2013 23:17:58 +0100 |
parents | 7bd72dadca4a (current diff) 7294a7be7dbd (diff) |
children | 06ac20b9a119 |
files | .hgtags |
diffstat | 6 files changed, 102 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jul 25 20:48:34 2013 +0100 +++ b/.hgtags Thu Aug 08 23:17:58 2013 +0100 @@ -215,6 +215,7 @@ afdfcc0ca555b69a5d9ddec458c0036a318b63b9 icedtea-2.3.6 afdfcc0ca555b69a5d9ddec458c0036a318b63b9 icedtea-2.3.6 0000000000000000000000000000000000000000 icedtea-2.3.6 +2d6017454236d4e95aad7feaff5fc92a612598f4 jdk7u6-b31 2d6017454236d4e95aad7feaff5fc92a612598f4 jdk7u7-b10 27041587508dbc4e08c956ba98a11ce0d5608dc4 jdk7u7-b30 b92a9f4f6bce4ec500ed3adb8203e6424b579f94 jdk7u7-b11 @@ -228,6 +229,8 @@ 0d4cb328938002fa9a2efc8190ea97beae3230a9 jdk7u9-b02 9148cdb9a18b55ad7d51bb9644b6db812de34eea jdk7u9-b04 1de4a0865a714076b4922a9a7119adb98aee23f2 jdk7u9-b05 +5d1a6a593fa17933683b34ea3a55c7d13c028a13 jdk7u9-b31 +acd27fc7fcf3e9dc0a1ae7e101cc036e960b6295 jdk7u9-b32 8dfbebb98865d822ddd9e0b9641d21e8bdb8a866 jdk7u10-b10 01c6dde274bd520067264231b3015c37e8e62d24 jdk7u10-b11 1fb02747d3bce646374c2cab95048c516cec6b01 jdk7u10-b12 @@ -238,8 +241,11 @@ 7101b3e80e96b000b0b4f0bd7fe4dd7910d02f74 jdk7u10-b17 4f529e320d83f517a55065b4710c7f1e5ff692c9 jdk7u10-b18 1e5aed8511b9bea5c2ebe51a2d9094be8bac73cc jdk7u10-b30 +db426c20b06918feeeaa036d52a5096c2bb646b0 jdk7u10-b31 b01338429ab6821f44d19601de433b538942b53d jdk7u11-b20 aeef1c7e43bc2d4a0960ebf42b642f7a34ec8afc jdk7u11-b21 +92de02b43596ea1d01c87d56dbc9acc0960a90c3 jdk7u11-b32 +309b5ccd0501d48fa7eed29e45197b4101de4683 jdk7u11-b33 eaa8a0141c35edc382d7ce0b1148912db8422b16 jdk7u11-b03 e8071ede35dc5948f5ed127941be192a4a8c1ebd jdk7u11-b04 17b9bb22f3fd6a624879a29a3fc4b252327c113d jdk7u11-b05 @@ -257,6 +263,8 @@ 1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01 8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02 b00c1580ffa95d9edd567835e1b9a77cf8ca2af6 jdk7u15-b30 +2c82a733594aef14f7a91a910c6b7b20e6220078 jdk7u15-b31 +5639dfc55f771823fab02438e5c89c6b18f57d07 jdk7u15-b33 c160d7d1616d099afad0986b7d06aee2d9405e57 jdk7u15-b03 a778aaf53c52f78c92f29a1220d9f46de94c9247 jdk7u15-b32 edfcf07c2877af8efa649e514167b22b7f6fc0b4 jdk7u17-b01 @@ -264,3 +272,36 @@ 8cf15d334ad372f540d7504212cc21ff7a223852 icedtea-2.3.10 e2c5f493844a842ec31d5979825e4f35d9dd9bdb icedtea-2.3.11 6c9b532f428152081b7a610de342e6e90d9cbcb3 icedtea-2.3.12 +2782a1c60faf7585dee0af0ef585aeed3288e521 jdk7u17-b02 +0abc443a68676c7231b274a324d27204c735acac jdk7u17-b30 +1a9b32d36ff86136549f20156cf3e821295228a0 jdk7u17-b31 +a91bdaf125d89b8b2c6ff86c8055aab3b7d2546c jdk7u17-b32 +8a12629ea21378f96666628f472cd9a6936a4933 jdk7u21-b01 +82103a284427a2512fe884d8f232f1a83d46beb6 jdk7u21-b02 +9adfe6a84c3884d5c24f6655e89546a6e0a80129 jdk7u21-b03 +71704143744ee46f105bf1bf3e4b7aecaf9c1003 jdk7u21-b04 +0970c229028499d5348d77712edf42d712538441 jdk7u21-b05 +5e0127eb56c3f70bdf67a5b2c57cf218838371ae jdk7u21-b06 +08034557136e484b3a7c4d0ec9b21e57ea9cd30b jdk7u21-b07 +f3c75c441d5623186e43de0b5a645e12fc360c29 jdk7u21-b08 +b6c7a18b668b85bdc41914b2b354c1928deb659e jdk7u21-b09 +de06078efe709392d7faf44803d54b74599f6bda jdk7u21-b10 +e120818fc321b5d9d8573a58bf5f6a6eb7471229 jdk7u21-b11 +ff6f8ab2635c6e0b0f6bb1a68dca48b4fc31b107 jdk7u21-b30 +a87ad97e80ae1861143b477d8a8990dc6ecc9173 jdk7u21-b12 +884621bb9042cd4a06e230307f1e26f1c518346d jdk7u25-b01 +1311e3618232058b09fe7ea25eda4af8d3fe6807 jdk7u25-b02 +8dc40e209a12638ea18bb7ee436051768afa5d39 jdk7u25-b03 +d7f974b867c4cf771ab749871c2ff4d3f869f13f jdk7u25-b04 +e8d01d8ee8f547f97d8670157ddf5a798459b85a jdk7u25-b05 +25489e38393b7c70fb826069d50860fbc409d11d jdk7u25-b06 +11fd425a3ebee6fa02bd684d356300b3619e5e7a jdk7u25-b07 +edaa697ef947de30b940bef0a546590d09c99cd3 jdk7u25-b08 +17ee569d0c0130824ba27bc1b090114e6075c5f2 jdk7u25-b09 +41c1b02cd6a8fa7746752cc911da3dd4d380098d jdk7u25-b10 +0da9ef0d9fc5b017f960d65ae0cd07860a259621 jdk7u25-b11 +28358b2489b2ca29c1a6b79f643204da8924a3d7 jdk7u25-b12 +5ed8c453480063838b632c74f528924f529361a2 jdk7u25-b13 +c6342ec6a12f7283e2a73a80a44dcdd3683e2e8b jdk7u25-b14 +3b8323e24a636ac0638604d19fc116eb0eef6cdb jdk7u25-b15 +5d95c1e7c0913ad4bc0b5f0b559510d32557def2 jdk7u25-b30
--- a/test/com/sun/javadoc/testJavascript/TestJavascript.java Thu Jul 25 20:48:34 2013 +0100 +++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java Thu Aug 08 23:17:58 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 4665566 4855876 7025314 + * @bug 4665566 4855876 7025314 8012375 8015998 * @summary Verify that the output has the right javascript. * @author jamieh * @library ../lib/ @@ -35,7 +35,7 @@ public class TestJavascript extends JavadocTester { //Test information. - private static final String BUG_ID = "4665566-4855876"; + private static final String BUG_ID = "4665566-4855876-8012375"; //Javadoc arguments. private static final String[] ARGS = new String[] { @@ -53,8 +53,42 @@ " targetPage = \"\" + window.location.search;" + NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + NL + " targetPage = targetPage.substring(1);" + NL + - " if (targetPage.indexOf(\":\") != -1)" + NL + + " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL + " targetPage = \"undefined\";" + NL + + " function validURL(url) {" + NL + + " var pos = url.indexOf(\".html\");" + NL + + " if (pos == -1 || pos != url.length - 5)" + NL + + " return false;" + NL + + " var allowNumber = false;" + NL + + " var allowSep = false;" + NL + + " var seenDot = false;" + NL + + " for (var i = 0; i < url.length - 5; i++) {" + NL + + " var ch = url.charAt(i);" + NL + + " if ('a' <= ch && ch <= 'z' ||" + NL + + " 'A' <= ch && ch <= 'Z' ||" + NL + + " ch == '$' ||" + NL + + " ch == '_') {" + NL + + " allowNumber = true;" + NL + + " allowSep = true;" + NL + + " } else if ('0' <= ch && ch <= '9'" + NL + + " || ch == '-') {" + NL + + " if (!allowNumber)" + NL + + " return false;" + NL + + " } else if (ch == '/' || ch == '.') {" + NL + + " if (!allowSep)" + NL + + " return false;" + NL + + " allowNumber = false;" + NL + + " allowSep = false;" + NL + + " if (ch == '.')" + NL + + " seenDot = true;" + NL + + " if (ch == '/' && seenDot)" + NL + + " return false;" + NL + + " } else {" + NL + + " return false;" + NL + + " }" + NL + + " }" + NL + + " return true;" + NL + + " }" + NL + " function loadFrames() {" + NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + NL + " top.classFrame.location = top.targetPage;" + NL +
--- a/test/tools/javac/processing/6348499/T6348499.java Thu Jul 25 20:48:34 2013 +0100 +++ b/test/tools/javac/processing/6348499/T6348499.java Thu Aug 08 23:17:58 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,6 +47,7 @@ public static void main(String... args) { String testSrc = System.getProperty("test.src", "."); String testClasses = System.getProperty("test.classes"); + String testClassPath = System.getProperty("test.class.path", testClasses); String A_java = new File(testSrc, "A.java").getPath(); JavacTool tool = JavacTool.create(); MyDiagListener dl = new MyDiagListener(); @@ -55,7 +56,7 @@ fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, "A.java"))); Iterable<String> opts = Arrays.asList("-proc:only", "-processor", "A", - "-processorpath", testClasses); + "-processorpath", testClassPath); StringWriter out = new StringWriter(); JavacTask task = tool.getTask(out, fm, dl, opts, null, files); task.call();
--- a/test/tools/javac/processing/6414633/T6414633.java Thu Jul 25 20:48:34 2013 +0100 +++ b/test/tools/javac/processing/6414633/T6414633.java Thu Aug 08 23:17:58 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,20 +43,20 @@ public static void main(String... args) { String testSrc = System.getProperty("test.src", "."); String testClasses = System.getProperty("test.classes", "."); + String testClassPath = System.getProperty("test.class.path", testClasses); JavacTool tool = JavacTool.create(); MyDiagListener dl = new MyDiagListener(); StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, null); try { - fm.setLocation(StandardLocation.CLASS_PATH, Arrays.asList(new File(testClasses))); + fm.setLocation(StandardLocation.CLASS_PATH, pathToFiles(testClassPath)); } catch (IOException e) { throw new AssertionError(e); } Iterable<? extends JavaFileObject> files = fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, A.class.getName()+".java"))); String[] opts = { "-proc:only", - "-processor", A.class.getName(), - "-classpath", testClasses + System.getProperty("path.separator") + "../../lib" }; + "-processor", A.class.getName() }; JavacTask task = tool.getTask(null, fm, dl, Arrays.asList(opts), null, files); task.call(); @@ -65,6 +65,15 @@ throw new AssertionError(dl.diags + " diagnostics reported"); } + private static List<File> pathToFiles(String path) { + List<File> list = new ArrayList<File>(); + for (String s: path.split(File.pathSeparator)) { + if (!s.isEmpty()) + list.add(new File(s)); + } + return list; + } + private static class MyDiagListener implements DiagnosticListener<JavaFileObject> { public void report(Diagnostic d) {
--- a/test/tools/javac/processing/6430209/T6430209.java Thu Jul 25 20:48:34 2013 +0100 +++ b/test/tools/javac/processing/6430209/T6430209.java Thu Aug 08 23:17:58 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -56,6 +56,7 @@ // -proc:only -processor b6341534 -cp . ./src/*.java String testSrc = System.getProperty("test.src", "."); String testClasses = System.getProperty("test.classes") + System.getProperty("path.separator") + "../../lib"; + String testClassPath = System.getProperty("test.class.path", testClasses); JavacTool tool = JavacTool.create(); MyDiagListener dl = new MyDiagListener(); StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, null); @@ -64,7 +65,7 @@ new File(testSrc, "test0.java"), new File(testSrc, "test1.java"))); Iterable<String> opts = Arrays.asList("-proc:only", "-processor", "b6341534", - "-processorpath", testClasses); + "-processorpath", testClassPath); StringWriter out = new StringWriter(); JavacTask task = tool.getTask(out, fm, dl, opts, null, files); task.call();
--- a/test/tools/javac/processing/T6920317.java Thu Jul 25 20:48:34 2013 +0100 +++ b/test/tools/javac/processing/T6920317.java Thu Aug 08 23:17:58 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -156,7 +156,9 @@ String expect = null; opts.add("-processorpath"); - opts.add(System.getProperty("test.classes")); + String testClasses = System.getProperty("test.classes"); + String testClassPath = System.getProperty("test.class.path", testClasses); + opts.add(testClassPath); opts.add("-processor"); opts.add(Processor.class.getName()); opts.add("-proc:only");