Merge

baaddf6f · asaha · 7d797c3b · 9ae8126d · baaddf6f · baaddf6f
隐藏空白更改
内联并排

Showing with 4 addition and 1 deletion

.hgtags .hgtags +1 -0

test/tools/javap/T6587786.java test/tools/javap/T6587786.java +3 -1

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -865,4 +865,5 @@ c25be482f93d465d7a1fadf1df1428683d1b42fb jdk8u171-b04
 989188d1a978fea3255e733c89718b8c0b21a231 jdk8u172-b02
 c563af72dd015eb3e528dbd121d23f0743276baa jdk8u172-b03
 2fefa5723300276ed0076e09d491622030105a25 jdk8u172-b04
+a459065c13afe9e0e122fa232f48ba95ab23d3f5 jdk8u181-b00
 fc985725f819fe45abf54b0139b9aa3f34125189 jdk8u172-b05
--- a/test/tools/javap/T6587786.java
+++ b/test/tools/javap/T6587786.java
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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
@@ -22,6 +22,8 @@
 */

 /*
+ * @ignore  until JDK-8195589 is fixed
+ *
 * @test
 * @bug 6587786
 * @summary Javap throws error : "ERROR:Could not find <classname>" for JRE classes