archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6868553: 6867671 breaks some tests

Browse source 
Reviewed-by: mcimadamore
This commit is contained in:
Jonathan Gibbons 2009-08-05 07:43:50 -07:00
parent 22c0a5cddf
commit ea9763ee24
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java
View file

@ -329,7 +329,7 @@ public class AttributeWriter extends BasicWriter
print("InnerClass"); print("InnerClass");
else else
print("InnerClasses"); print("InnerClasses");
println(": "); println(":");
indent(+1); indent(+1);
} }

2
langtools/test/tools/javac/code/ArrayClone.java
View file

@ -48,7 +48,7 @@ public class ArrayClone {
System.out.println(out); System.out.println(out);
for (String line: out.split("\n")) { for (String line: out.split("\n")) {
String match = "[ \t]+[0-9]+:[ \t]+invokevirtual[ \t]+#[0-9]+; //Method \"\\[Ljava/lang/String;\".clone:\\(\\)Ljava/lang/Object;"; String match = "[ \t]+[0-9]+:[ \t]+invokevirtual[ \t]+#[0-9]+;[ \t]+// Method \"\\[Ljava/lang/String;\".clone:\\(\\)Ljava/lang/Object;";
if (line.matches(match)) if (line.matches(match))
return; return;
} }

2
langtools/test/tools/javap/4111861/T4111861.java
View file

@ -89,7 +89,7 @@ public class T4111861 {
String line; String line;
while ((line = in.readLine()) != null) { while ((line = in.readLine()) != null) {
if (line.indexOf("public static final") > 0) { if (line.indexOf("public static final") > 0) {
sb.append(line); sb.append(line.trim());
sb.append('\n'); sb.append('\n');
} }
} }

6
langtools/test/tools/javap/T4884240.java
View file

@ -46,9 +46,9 @@ public class T4884240 {
pw.close(); pw.close();
String[] lines = sw.toString().split("\n"); String[] lines = sw.toString().split("\n");
if (lines.length < 3 if (lines.length < 3
|| !lines[0].startsWith("Classfile") || !lines[0].trim().startsWith("Classfile")
|| !lines[1].startsWith("Last modified") || !lines[1].trim().startsWith("Last modified")
|| !lines[2].startsWith("MD5")) { || !lines[2].trim().startsWith("MD5")) {
System.out.println(sw); System.out.println(sw);
throw new Exception("unexpected output"); throw new Exception("unexpected output");
} }

4
langtools/test/tools/javap/T4975569.java
View file

@ -40,10 +40,10 @@ public class T4975569
verify("T4975569$Anno", "flags: ACC_INTERFACE, ACC_ABSTRACT, ACC_ANNOTATION"); verify("T4975569$Anno", "flags: ACC_INTERFACE, ACC_ABSTRACT, ACC_ANNOTATION");
verify("T4975569$E", "flags: ACC_FINAL, ACC_SUPER, ACC_ENUM"); verify("T4975569$E", "flags: ACC_FINAL, ACC_SUPER, ACC_ENUM");
verify("T4975569$S", "flags: ACC_BRIDGE, ACC_SYNTHETIC", verify("T4975569$S", "flags: ACC_BRIDGE, ACC_SYNTHETIC",
"InnerClasses: \n static"); "InnerClasses:\n static");
verify("T4975569$V", "void m(java.lang.String...)", verify("T4975569$V", "void m(java.lang.String...)",
"flags: ACC_VARARGS"); "flags: ACC_VARARGS");
verify("T4975569$Prot", "InnerClasses: \n protected"); verify("T4975569$Prot", "InnerClasses:\n protected");
//verify("T4975569$Priv", "InnerClasses"); //verify("T4975569$Priv", "InnerClasses");
if (errors > 0) if (errors > 0)
throw new Error(errors + " found."); throw new Error(errors + " found.");

2
langtools/test/tools/javap/stackmap/T6271292.sh
View file

@ -75,7 +75,7 @@ grep "frame_type" "${JAVAPFILE}" > "${OUTFILE}"
grep "offset_delta" "${JAVAPFILE}" >> "${OUTFILE}" grep "offset_delta" "${JAVAPFILE}" >> "${OUTFILE}"
grep "stack = " "${JAVAPFILE}" >> "${OUTFILE}" grep "stack = " "${JAVAPFILE}" >> "${OUTFILE}"
grep "locals = " "${JAVAPFILE}" >> "${OUTFILE}" grep "locals = " "${JAVAPFILE}" >> "${OUTFILE}"
diff "${OUTFILE}" "${TESTSRC}${FS}T6271292.out" diff -w "${OUTFILE}" "${TESTSRC}${FS}T6271292.out"
result="$?" result="$?"
if [ "$result" -eq 0 ] if [ "$result" -eq 0 ]
then then