Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/test/tools/javac/4980495/static/Test.java	Thu Jul 22 11:02:54 2010 -0700
     1.2 +++ b/test/tools/javac/4980495/static/Test.java	Mon Jul 26 14:18:45 2010 -0700
     1.3 @@ -1,7 +1,7 @@
     1.4  /*
     1.5   * @test  /nodynamiccopyright/
     1.6   * @bug 4980495 6260444
     1.7 - * @compile/fail/ref=Test.out -XDstdout -XDrawDiagnostics Test.java p1/A1.java p2/A2.java
     1.8 + * @compile/fail/ref=Test.out -XDrawDiagnostics Test.java p1/A1.java p2/A2.java
     1.9   */
    1.10  
    1.11  package p;

     2.1 --- a/test/tools/javac/4980495/std/Test.java	Thu Jul 22 11:02:54 2010 -0700
     2.2 +++ b/test/tools/javac/4980495/std/Test.java	Mon Jul 26 14:18:45 2010 -0700
     2.3 @@ -1,7 +1,7 @@
     2.4  /*
     2.5   * @test  /nodynamiccopyright/
     2.6   * @bug 4980495 6260444
     2.7 - * @compile/fail/ref=Test.out -XDstdout -XDrawDiagnostics Test.java p1/A1.java p2/A2.java
     2.8 + * @compile/fail/ref=Test.out -XDrawDiagnostics Test.java p1/A1.java p2/A2.java
     2.9   *
    2.10   */
    2.11  

     3.1 --- a/test/tools/javac/6304921/T6304921.java	Thu Jul 22 11:02:54 2010 -0700
     3.2 +++ b/test/tools/javac/6304921/T6304921.java	Mon Jul 26 14:18:45 2010 -0700
     3.3 @@ -1,7 +1,7 @@
     3.4  /*
     3.5   * @test (important: no SCCS keywords to affect offsets in golden file.)  /nodynamiccopyright/
     3.6   * @bug 6304921
     3.7 - * @compile/fail/ref=T6304921.out -XDstdout -XDcompilePolicy=bytodo -XDrawDiagnostics -Xjcov -Xlint:all,-path -Werror T6304921.java
     3.8 + * @compile/fail/ref=T6304921.out -XDcompilePolicy=bytodo -XDrawDiagnostics -Xjcov -Xlint:all,-path -Werror T6304921.java
     3.9   */
    3.10  
    3.11  import java.util.ArrayList;

     4.1 --- a/test/tools/javac/6330920/T6330920.java	Thu Jul 22 11:02:54 2010 -0700
     4.2 +++ b/test/tools/javac/6330920/T6330920.java	Mon Jul 26 14:18:45 2010 -0700
     4.3 @@ -3,7 +3,7 @@
     4.4   * @bug     6330920
     4.5   * @summary Verify that javac doesn't duplicate method error on method with error
     4.6   * @author  Peter von der Ah\u00e9
     4.7 - * @compile/fail/ref=T6330920.out -XDstdout -XDrawDiagnostics T6330920.java
     4.8 + * @compile/fail/ref=T6330920.out -XDrawDiagnostics T6330920.java
     4.9   */
    4.10  
    4.11  public class T6330920 {

     5.1 --- a/test/tools/javac/6491592/T6491592.java	Thu Jul 22 11:02:54 2010 -0700
     5.2 +++ b/test/tools/javac/6491592/T6491592.java	Mon Jul 26 14:18:45 2010 -0700
     5.3 @@ -3,7 +3,7 @@
     5.4   * @bug     6491592
     5.5   * @summary Compiler crashes on assignment operator
     5.6   * @author  alex.buckley@...
     5.7 - * @compile/fail/ref=T6491592.out -XDstdout -XDrawDiagnostics T6491592.java
     5.8 + * @compile/fail/ref=T6491592.out -XDrawDiagnostics T6491592.java
     5.9   */
    5.10  
    5.11  public class T6491592 {

     6.1 --- a/test/tools/javac/6717241/T6717241a.java	Thu Jul 22 11:02:54 2010 -0700
     6.2 +++ b/test/tools/javac/6717241/T6717241a.java	Mon Jul 26 14:18:45 2010 -0700
     6.3 @@ -3,7 +3,7 @@
     6.4   * @bug     6717241
     6.5   * @summary some diagnostic argument is prematurely converted into a String object
     6.6   * @author  Maurizio Cimadamore
     6.7 - * @compile/fail/ref=T6717241a.out -XDstdout -XDrawDiagnostics T6717241a.java
     6.8 + * @compile/fail/ref=T6717241a.out -XDrawDiagnostics T6717241a.java
     6.9   */
    6.10  
    6.11  class T6717241a<X extends Object & java.io.Serializable> {

     7.1 --- a/test/tools/javac/6717241/T6717241b.java	Thu Jul 22 11:02:54 2010 -0700
     7.2 +++ b/test/tools/javac/6717241/T6717241b.java	Mon Jul 26 14:18:45 2010 -0700
     7.3 @@ -3,7 +3,7 @@
     7.4   * @bug     6717241
     7.5   * @summary some diagnostic argument is prematurely converted into a String object
     7.6   * @author  Maurizio Cimadamore
     7.7 - * @compile/fail/ref=T6717241b.out -XDstdout -XDrawDiagnostics T6717241b.java
     7.8 + * @compile/fail/ref=T6717241b.out -XDrawDiagnostics T6717241b.java
     7.9   */
    7.10  
    7.11  class T6717241b {

     8.1 --- a/test/tools/javac/ClassFileModifiers/ClassModifiers.java	Thu Jul 22 11:02:54 2010 -0700
     8.2 +++ b/test/tools/javac/ClassFileModifiers/ClassModifiers.java	Mon Jul 26 14:18:45 2010 -0700
     8.3 @@ -28,7 +28,7 @@
     8.4   * file are correct, including those within InnerClasses attributes.
     8.5   * @author John Rose (jrose). Entered as a regression test by Bill Maddox (maddox).
     8.6   *
     8.7 - * @compile/ref=ClassModifiers.out -XDstdout  -XDdumpmodifiers=ci ClassModifiers.java
     8.8 + * @compile/ref=ClassModifiers.out  -XDdumpmodifiers=ci ClassModifiers.java
     8.9   *
    8.10   */
    8.11  

     9.1 --- a/test/tools/javac/ClassFileModifiers/MemberModifiers.java	Thu Jul 22 11:02:54 2010 -0700
     9.2 +++ b/test/tools/javac/ClassFileModifiers/MemberModifiers.java	Mon Jul 26 14:18:45 2010 -0700
     9.3 @@ -26,7 +26,7 @@
     9.4   * @bug 4249112 4785453
     9.5   * @summary Verify that implicit member modifiers are set correctly.
     9.6   *
     9.7 - * @compile/ref=MemberModifiers.out -XDstdout  -source 1.4 -target 1.4.2 -XDdumpmodifiers=cfm MemberModifiers.java
     9.8 + * @compile/ref=MemberModifiers.out  -source 1.4 -target 1.4.2 -XDdumpmodifiers=cfm MemberModifiers.java
     9.9   */
    9.10  
    9.11  // Currently, we check only that members of final classes are not final.

    10.1 --- a/test/tools/javac/CyclicInheritance.java	Thu Jul 22 11:02:54 2010 -0700
    10.2 +++ b/test/tools/javac/CyclicInheritance.java	Mon Jul 26 14:18:45 2010 -0700
    10.3 @@ -4,7 +4,7 @@
    10.4   * @summary Test that recursive 'extends' and 'implements' clauses are detected
    10.5   * and disallowed.
    10.6   *
    10.7 - * @compile/fail/ref=CyclicInheritance.out -XDrawDiagnostics -XDstdout CyclicInheritance.java
    10.8 + * @compile/fail/ref=CyclicInheritance.out -XDrawDiagnostics CyclicInheritance.java
    10.9   */
   10.10  
   10.11  

    11.1 --- a/test/tools/javac/Digits.java	Thu Jul 22 11:02:54 2010 -0700
    11.2 +++ b/test/tools/javac/Digits.java	Mon Jul 26 14:18:45 2010 -0700
    11.3 @@ -2,7 +2,7 @@
    11.4   * @test  /nodynamiccopyright/
    11.5   * @bug 6183529
    11.6   * @summary javac gives warnings instead of errors on non-ASCII digits
    11.7 - * @compile/fail/ref=Digits.out -XDstdout -XDrawDiagnostics Digits.java
    11.8 + * @compile/fail/ref=Digits.out -XDrawDiagnostics Digits.java
    11.9   */
   11.10  
   11.11  class Digits

    12.1 --- a/test/tools/javac/ExtendArray.java	Thu Jul 22 11:02:54 2010 -0700
    12.2 +++ b/test/tools/javac/ExtendArray.java	Mon Jul 26 14:18:45 2010 -0700
    12.3 @@ -3,7 +3,7 @@
    12.4   * @bug 4336282 4785453
    12.5   * @summary Verify that extending an erray class does not crash the compiler.
    12.6   *
    12.7 - * @compile/fail/ref=ExtendArray.out -XDstdout -XDrawDiagnostics ExtendArray.java
    12.8 + * @compile/fail/ref=ExtendArray.out -XDrawDiagnostics ExtendArray.java
    12.9   */
   12.10  
   12.11  // Note that an error is expected, but not a crash.

    13.1 --- a/test/tools/javac/ExtendsAccess/ExtendsAccess.java	Thu Jul 22 11:02:54 2010 -0700
    13.2 +++ b/test/tools/javac/ExtendsAccess/ExtendsAccess.java	Mon Jul 26 14:18:45 2010 -0700
    13.3 @@ -3,7 +3,7 @@
    13.4   * @bug 4087314 4087314 4785453
    13.5   * @summary Test access checking within 'extends' and 'implements' clause.
    13.6   * @author William Maddox (maddox)
    13.7 - * @compile/fail/ref=ExtendsAccess.out -XDrawDiagnostics -XDstdout ExtendsAccess.java
    13.8 + * @compile/fail/ref=ExtendsAccess.out -XDrawDiagnostics ExtendsAccess.java
    13.9   */
   13.10  
   13.11  /*

    14.1 --- a/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.java	Thu Jul 22 11:02:54 2010 -0700
    14.2 +++ b/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.java	Mon Jul 26 14:18:45 2010 -0700
    14.3 @@ -4,7 +4,7 @@
    14.4   * @summary strictfp may not be used with constructors
    14.5   * @author David Stoutamire (dps)
    14.6   *
    14.7 - * @compile/fail/ref=BadConstructorModifiers.out -XDrawDiagnostics -XDstdout BadConstructorModifiers.java
    14.8 + * @compile/fail/ref=BadConstructorModifiers.out -XDrawDiagnostics BadConstructorModifiers.java
    14.9   */
   14.10  
   14.11  public class BadConstructorModifiers {

    15.1 --- a/test/tools/javac/IllegalAnnotation.java	Thu Jul 22 11:02:54 2010 -0700
    15.2 +++ b/test/tools/javac/IllegalAnnotation.java	Mon Jul 26 14:18:45 2010 -0700
    15.3 @@ -4,7 +4,7 @@
    15.4   * @summary javac crash when declare an annotation type illegally
    15.5   *
    15.6   * @compile/fail IllegalAnnotation.java
    15.7 - * @compile/fail/ref=IllegalAnnotation.out -XDdev -XDrawDiagnostics -XDstdout IllegalAnnotation.java
    15.8 + * @compile/fail/ref=IllegalAnnotation.out -XDdev -XDrawDiagnostics IllegalAnnotation.java
    15.9   */
   15.10  class IllegalAnnotation {
   15.11      {

    16.1 --- a/test/tools/javac/InnerNamedConstant_2.java	Thu Jul 22 11:02:54 2010 -0700
    16.2 +++ b/test/tools/javac/InnerNamedConstant_2.java	Mon Jul 26 14:18:45 2010 -0700
    16.3 @@ -4,7 +4,7 @@
    16.4   * @summary Verify rejection of illegal static variables in inner classes.
    16.5   * @author William Maddox (maddox)
    16.6   *
    16.7 - * @compile/fail/ref=InnerNamedConstant_2.out -XDrawDiagnostics -XDstdout InnerNamedConstant_2.java
    16.8 + * @compile/fail/ref=InnerNamedConstant_2.out -XDrawDiagnostics InnerNamedConstant_2.java
    16.9   */
   16.10  
   16.11  public class InnerNamedConstant_2 {

    17.1 --- a/test/tools/javac/InterfaceMemberClassModifiers.java	Thu Jul 22 11:02:54 2010 -0700
    17.2 +++ b/test/tools/javac/InterfaceMemberClassModifiers.java	Mon Jul 26 14:18:45 2010 -0700
    17.3 @@ -4,7 +4,7 @@
    17.4   * @summary Verify that invalid access modifiers on interface members don't cause crash.
    17.5   * @author maddox
    17.6   *
    17.7 - * @compile/fail/ref=InterfaceMemberClassModifiers.out -XDstdout -XDdiags=%b:%l:%_%m InterfaceMemberClassModifiers.java
    17.8 + * @compile/fail/ref=InterfaceMemberClassModifiers.out -XDdiags=%b:%l:%_%m InterfaceMemberClassModifiers.java
    17.9   */
   17.10  
   17.11  public interface InterfaceMemberClassModifiers {

    18.1 --- a/test/tools/javac/LocalClasses_2.java	Thu Jul 22 11:02:54 2010 -0700
    18.2 +++ b/test/tools/javac/LocalClasses_2.java	Mon Jul 26 14:18:45 2010 -0700
    18.3 @@ -4,7 +4,7 @@
    18.4   * @summary Verify that a local class cannot be redefined within its scope.
    18.5   * @author William Maddox (maddox)
    18.6   *
    18.7 - * @compile/fail/ref=LocalClasses_2.out -XDrawDiagnostics -XDstdout LocalClasses_2.java
    18.8 + * @compile/fail/ref=LocalClasses_2.out -XDrawDiagnostics LocalClasses_2.java
    18.9   */
   18.10  
   18.11  class LocalClasses_2 {

    19.1 --- a/test/tools/javac/NameCollision.java	Thu Jul 22 11:02:54 2010 -0700
    19.2 +++ b/test/tools/javac/NameCollision.java	Mon Jul 26 14:18:45 2010 -0700
    19.3 @@ -4,7 +4,7 @@
    19.4   * @summary Interface names for classes in the same scope should not
    19.5   * cause the compiler to crash.
    19.6   *
    19.7 - * @compile/fail/ref=NameCollision.out -XDrawDiagnostics -XDstdout NameCollision.java
    19.8 + * @compile/fail/ref=NameCollision.out -XDrawDiagnostics NameCollision.java
    19.9   */
   19.10  
   19.11  // The test fails if the compiler crashes.

    20.1 --- a/test/tools/javac/NestedInnerClassNames.java	Thu Jul 22 11:02:54 2010 -0700
    20.2 +++ b/test/tools/javac/NestedInnerClassNames.java	Mon Jul 26 14:18:45 2010 -0700
    20.3 @@ -4,7 +4,7 @@
    20.4   * @summary Verify that an inner class cannot have the same simple name as an enclosing one.
    20.5   * @author William Maddox (maddox)
    20.6   *
    20.7 - * @compile/fail/ref=NestedInnerClassNames.out -XDrawDiagnostics -XDstdout NestedInnerClassNames.java
    20.8 + * @compile/fail/ref=NestedInnerClassNames.out -XDrawDiagnostics NestedInnerClassNames.java
    20.9   */
   20.10  
   20.11  /*

    21.1 --- a/test/tools/javac/NonStaticFieldExpr1.java	Thu Jul 22 11:02:54 2010 -0700
    21.2 +++ b/test/tools/javac/NonStaticFieldExpr1.java	Mon Jul 26 14:18:45 2010 -0700
    21.3 @@ -3,7 +3,7 @@
    21.4     @author dps
    21.5     @summary field: instance access through types is not allowed
    21.6  
    21.7 -   @compile/fail/ref=NonStaticFieldExpr1.out -XDrawDiagnostics -XDstdout NonStaticFieldExpr1.java
    21.8 +   @compile/fail/ref=NonStaticFieldExpr1.out -XDrawDiagnostics NonStaticFieldExpr1.java
    21.9  */
   21.10  class NonStaticFieldExpr1 {
   21.11    public int x;

    22.1 --- a/test/tools/javac/NonStaticFieldExpr2.java	Thu Jul 22 11:02:54 2010 -0700
    22.2 +++ b/test/tools/javac/NonStaticFieldExpr2.java	Mon Jul 26 14:18:45 2010 -0700
    22.3 @@ -3,7 +3,7 @@
    22.4     @author dps
    22.5     @summary method: instance access through types is not allowed
    22.6  
    22.7 -   @compile/fail/ref=NonStaticFieldExpr2.out -XDrawDiagnostics -XDstdout NonStaticFieldExpr2.java
    22.8 +   @compile/fail/ref=NonStaticFieldExpr2.out -XDrawDiagnostics NonStaticFieldExpr2.java
    22.9  */
   22.10  
   22.11  class NonStaticFieldExpr2 {

    23.1 --- a/test/tools/javac/NonStaticFieldExpr3.java	Thu Jul 22 11:02:54 2010 -0700
    23.2 +++ b/test/tools/javac/NonStaticFieldExpr3.java	Mon Jul 26 14:18:45 2010 -0700
    23.3 @@ -3,7 +3,7 @@
    23.4     @author dps
    23.5     @summary class: instance access through types is not allowed
    23.6  
    23.7 -   @compile/fail/ref=NonStaticFieldExpr3.out -XDrawDiagnostics -XDstdout NonStaticFieldExpr3.java
    23.8 +   @compile/fail/ref=NonStaticFieldExpr3.out -XDrawDiagnostics NonStaticFieldExpr3.java
    23.9  */
   23.10  
   23.11  class NonStaticFieldExpr3 {

    24.1 --- a/test/tools/javac/OverridePosition.java	Thu Jul 22 11:02:54 2010 -0700
    24.2 +++ b/test/tools/javac/OverridePosition.java	Mon Jul 26 14:18:45 2010 -0700
    24.3 @@ -4,7 +4,7 @@
    24.4   * @summary "attemping to assign weaker access" message doesn't give method line number
    24.5   * @author Neal Gafter
    24.6   *
    24.7 - * @compile/fail/ref=OverridePosition.out -XDstdout -XDrawDiagnostics OverridePosition.java
    24.8 + * @compile/fail/ref=OverridePosition.out -XDrawDiagnostics OverridePosition.java
    24.9   */
   24.10  
   24.11  package T4524388;

    25.1 --- a/test/tools/javac/QualifiedAccess/QualifiedAccess_1.java	Thu Jul 22 11:02:54 2010 -0700
    25.2 +++ b/test/tools/javac/QualifiedAccess/QualifiedAccess_1.java	Mon Jul 26 14:18:45 2010 -0700
    25.3 @@ -7,7 +7,7 @@
    25.4   *
    25.5   * @compile pack1/P1.java
    25.6   * @compile pack1/P2.java
    25.7 - * @compile/fail/ref=QualifiedAccess_1.out -XDrawDiagnostics -XDstdout QualifiedAccess_1.java
    25.8 + * @compile/fail/ref=QualifiedAccess_1.out -XDrawDiagnostics QualifiedAccess_1.java
    25.9   */
   25.10  
   25.11  import pack1.P1;

    26.1 --- a/test/tools/javac/QualifiedAccess/QualifiedAccess_2.java	Thu Jul 22 11:02:54 2010 -0700
    26.2 +++ b/test/tools/javac/QualifiedAccess/QualifiedAccess_2.java	Mon Jul 26 14:18:45 2010 -0700
    26.3 @@ -7,7 +7,7 @@
    26.4   *
    26.5   * @compile pack1/P1.java
    26.6   * @compile pack1/P2.java
    26.7 - * @compile/fail/ref=QualifiedAccess_2.out -XDrawDiagnostics -XDstdout QualifiedAccess_2.java
    26.8 + * @compile/fail/ref=QualifiedAccess_2.out -XDrawDiagnostics QualifiedAccess_2.java
    26.9   */
   26.10  
   26.11  import pack1.P1;

    27.1 --- a/test/tools/javac/QualifiedAccess/QualifiedAccess_3.java	Thu Jul 22 11:02:54 2010 -0700
    27.2 +++ b/test/tools/javac/QualifiedAccess/QualifiedAccess_3.java	Mon Jul 26 14:18:45 2010 -0700
    27.3 @@ -5,7 +5,7 @@
    27.4   * the type to which a component member belongs be accessible in qualified
    27.5   * names.
    27.6   *
    27.7 - * @compile/fail/ref=QualifiedAccess_3.out -XDrawDiagnostics -XDstdout QualifiedAccess_3.java
    27.8 + * @compile/fail/ref=QualifiedAccess_3.out -XDrawDiagnostics QualifiedAccess_3.java
    27.9   */
   27.10  
   27.11  import pack1.P1;

    28.1 --- a/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.java	Thu Jul 22 11:02:54 2010 -0700
    28.2 +++ b/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.java	Mon Jul 26 14:18:45 2010 -0700
    28.3 @@ -3,7 +3,7 @@
    28.4   * @bug 6827009
    28.5   * @summary Check for case labels of different types.
    28.6   * @compile/fail -source 6 BadlyTypedLabel1.java
    28.7 - * @compile/fail/ref=BadlyTypedLabel1.out -XDstdout -XDrawDiagnostics BadlyTypedLabel1.java
    28.8 + * @compile/fail/ref=BadlyTypedLabel1.out -XDrawDiagnostics BadlyTypedLabel1.java
    28.9   */
   28.10  class BadlyTypedLabel1 {
   28.11      String m(String s) {

    29.1 --- a/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.java	Thu Jul 22 11:02:54 2010 -0700
    29.2 +++ b/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.java	Mon Jul 26 14:18:45 2010 -0700
    29.3 @@ -3,7 +3,7 @@
    29.4   * @bug 6827009
    29.5   * @summary Check for case lables of different types.
    29.6   * @compile/fail -source 6 BadlyTypedLabel2.java
    29.7 - * @compile/fail/ref=BadlyTypedLabel2.out -XDstdout -XDrawDiagnostics BadlyTypedLabel2.java
    29.8 + * @compile/fail/ref=BadlyTypedLabel2.out -XDrawDiagnostics BadlyTypedLabel2.java
    29.9   */
   29.10  import static java.math.RoundingMode.*;
   29.11  

    30.1 --- a/test/tools/javac/StringsInSwitch/NonConstantLabel.java	Thu Jul 22 11:02:54 2010 -0700
    30.2 +++ b/test/tools/javac/StringsInSwitch/NonConstantLabel.java	Mon Jul 26 14:18:45 2010 -0700
    30.3 @@ -3,7 +3,7 @@
    30.4   * @bug 6827009
    30.5   * @summary Check for non-constant case labels.
    30.6   * @compile/fail -source 6 NonConstantLabel.java
    30.7 - * @compile/fail/ref=NonConstantLabel.out -XDstdout -XDrawDiagnostics NonConstantLabel.java
    30.8 + * @compile/fail/ref=NonConstantLabel.out -XDrawDiagnostics NonConstantLabel.java
    30.9   */
   30.10  class NonConstantLabel {
   30.11      String m(String s) {

    31.1 --- a/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels1.java	Thu Jul 22 11:02:54 2010 -0700
    31.2 +++ b/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels1.java	Mon Jul 26 14:18:45 2010 -0700
    31.3 @@ -3,7 +3,7 @@
    31.4   * @bug 6827009
    31.5   * @summary Check for repeated string case labels.
    31.6   * @compile/fail -source 6 RepeatedStringCaseLabels1.java
    31.7 - * @compile/fail/ref=RSCL1.out -XDstdout -XDrawDiagnostics RepeatedStringCaseLabels1.java
    31.8 + * @compile/fail/ref=RSCL1.out -XDrawDiagnostics RepeatedStringCaseLabels1.java
    31.9   */
   31.10  class RepeatedStringCaseLabels1 {
   31.11      String m(String s) {

    32.1 --- a/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels2.java	Thu Jul 22 11:02:54 2010 -0700
    32.2 +++ b/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels2.java	Mon Jul 26 14:18:45 2010 -0700
    32.3 @@ -3,7 +3,7 @@
    32.4   * @bug 6827009
    32.5   * @summary Check for repeated string case labels.
    32.6   * @compile/fail -source 6 RepeatedStringCaseLabels2.java
    32.7 - * @compile/fail/ref=RSCL2.out -XDstdout -XDrawDiagnostics RepeatedStringCaseLabels2.java
    32.8 + * @compile/fail/ref=RSCL2.out -XDrawDiagnostics RepeatedStringCaseLabels2.java
    32.9   */
   32.10  class RepeatedStringCaseLabels2 {
   32.11      String m(String s) {

    33.1 --- a/test/tools/javac/SynchronizedClass.java	Thu Jul 22 11:02:54 2010 -0700
    33.2 +++ b/test/tools/javac/SynchronizedClass.java	Mon Jul 26 14:18:45 2010 -0700
    33.3 @@ -3,7 +3,7 @@
    33.4     @summary Verify that ClassModifier "synchronized" is not allowed.
    33.5     @author dps
    33.6  
    33.7 -   @compile/fail/ref=SynchronizedClass.out -XDrawDiagnostics -XDstdout SynchronizedClass.java
    33.8 +   @compile/fail/ref=SynchronizedClass.out -XDrawDiagnostics SynchronizedClass.java
    33.9  */
   33.10  
   33.11  public synchronized class SynchronizedClass { } // ERROR

    34.1 --- a/test/tools/javac/T4093617/T4093617.java	Thu Jul 22 11:02:54 2010 -0700
    34.2 +++ b/test/tools/javac/T4093617/T4093617.java	Mon Jul 26 14:18:45 2010 -0700
    34.3 @@ -3,7 +3,7 @@
    34.4   * @bug     4093617
    34.5   * @summary Object has no superclass
    34.6   * @author  Peter von der Ah\u00e9
    34.7 - * @compile/fail/ref=T4093617.out -XDstdout -XDrawDiagnostics T4093617.java
    34.8 + * @compile/fail/ref=T4093617.out -XDrawDiagnostics T4093617.java
    34.9   */
   34.10  
   34.11  package java.lang;

    35.1 --- a/test/tools/javac/T4906100.java	Thu Jul 22 11:02:54 2010 -0700
    35.2 +++ b/test/tools/javac/T4906100.java	Mon Jul 26 14:18:45 2010 -0700
    35.3 @@ -2,7 +2,7 @@
    35.4   * @test  /nodynamiccopyright/
    35.5   * @bug 4906100
    35.6   * @summary detect empty statement after if
    35.7 - * @compile/ref=T4906100.out -XDstdout -XDrawDiagnostics -Xlint:empty T4906100.java
    35.8 + * @compile/ref=T4906100.out -XDrawDiagnostics -Xlint:empty T4906100.java
    35.9   */
   35.10  
   35.11  class T4906100 {

    36.1 --- a/test/tools/javac/T4994049/T4994049.java	Thu Jul 22 11:02:54 2010 -0700
    36.2 +++ b/test/tools/javac/T4994049/T4994049.java	Mon Jul 26 14:18:45 2010 -0700
    36.3 @@ -3,7 +3,7 @@
    36.4   * @bug     4994049
    36.5   * @summary Improved diagnostics while parsing enums
    36.6   * @author  Peter von der Ah\u00e9
    36.7 - * @compile/fail/ref=T4994049.out -XDstdout -XDrawDiagnostics T4994049.java
    36.8 + * @compile/fail/ref=T4994049.out -XDrawDiagnostics T4994049.java
    36.9   */
   36.10  
   36.11  public enum T4994049 {

    37.1 --- a/test/tools/javac/T5003235/T5003235a.java	Thu Jul 22 11:02:54 2010 -0700
    37.2 +++ b/test/tools/javac/T5003235/T5003235a.java	Mon Jul 26 14:18:45 2010 -0700
    37.3 @@ -3,7 +3,7 @@
    37.4   * @bug     5003235
    37.5   * @summary Private inner class accessible from subclasses
    37.6   * @author  Peter von der Ah\u00e9
    37.7 - * @compile/fail/ref=T5003235a.out -XDstdout -XDdiags=%b:%l:%_%m T5003235a.java
    37.8 + * @compile/fail/ref=T5003235a.out -XDdiags=%b:%l:%_%m T5003235a.java
    37.9   */
   37.10  
   37.11  class Super {

    38.1 --- a/test/tools/javac/T5003235/T5003235b.java	Thu Jul 22 11:02:54 2010 -0700
    38.2 +++ b/test/tools/javac/T5003235/T5003235b.java	Mon Jul 26 14:18:45 2010 -0700
    38.3 @@ -3,7 +3,7 @@
    38.4   * @bug     5003235
    38.5   * @summary Accessibility of private inner class
    38.6   * @author  Peter von der Ah\u00e9
    38.7 - * @compile/fail/ref=T5003235b.out -XDstdout -XDdiags=%b:%l:%_%m T5003235b.java
    38.8 + * @compile/fail/ref=T5003235b.out -XDdiags=%b:%l:%_%m T5003235b.java
    38.9   */
   38.10  
   38.11  class Outer {

    39.1 --- a/test/tools/javac/T5003235/T5003235c.java	Thu Jul 22 11:02:54 2010 -0700
    39.2 +++ b/test/tools/javac/T5003235/T5003235c.java	Mon Jul 26 14:18:45 2010 -0700
    39.3 @@ -3,7 +3,7 @@
    39.4   * @bug     5003235
    39.5   * @summary Access to private inner classes
    39.6   * @author  Peter von der Ah\u00e9
    39.7 - * @compile/fail/ref=T5003235c.out -XDstdout -XDrawDiagnostics T5003235c.java
    39.8 + * @compile/fail/ref=T5003235c.out -XDrawDiagnostics T5003235c.java
    39.9   */
   39.10  
   39.11  class T5003235c {

    40.1 --- a/test/tools/javac/T5024091/T5024091.java	Thu Jul 22 11:02:54 2010 -0700
    40.2 +++ b/test/tools/javac/T5024091/T5024091.java	Mon Jul 26 14:18:45 2010 -0700
    40.3 @@ -3,7 +3,7 @@
    40.4   * @bug     5024091
    40.5   * @summary AssertionError shouldn't be thrown
    40.6   * @author  Wei Tao
    40.7 - * @compile/fail/ref=T5024091.out -XDfailcomplete=java.lang.StringBuilder -XDdev -XDstdout -XDrawDiagnostics T5024091.java
    40.8 + * @compile/fail/ref=T5024091.out -XDfailcomplete=java.lang.StringBuilder -XDdev -XDrawDiagnostics T5024091.java
    40.9   */
   40.10  
   40.11  public class T5024091 {

    41.1 --- a/test/tools/javac/T5048776.java	Thu Jul 22 11:02:54 2010 -0700
    41.2 +++ b/test/tools/javac/T5048776.java	Mon Jul 26 14:18:45 2010 -0700
    41.3 @@ -1,8 +1,8 @@
    41.4  /*
    41.5   * @test  /nodynamiccopyright/
    41.6   * @bug 5048776
    41.7 - * @compile/ref=T5048776a.out -XDstdout -XDrawDiagnostics                  T5048776.java
    41.8 - * @compile/ref=T5048776b.out -XDstdout -XDrawDiagnostics -Xlint:all,-path T5048776.java
    41.9 + * @compile/ref=T5048776a.out -XDrawDiagnostics                  T5048776.java
   41.10 + * @compile/ref=T5048776b.out -XDrawDiagnostics -Xlint:all,-path T5048776.java
   41.11   */
   41.12  class A1 {
   41.13      void foo(Object[] args) { }

    42.1 --- a/test/tools/javac/T6214885.java	Thu Jul 22 11:02:54 2010 -0700
    42.2 +++ b/test/tools/javac/T6214885.java	Mon Jul 26 14:18:45 2010 -0700
    42.3 @@ -2,8 +2,8 @@
    42.4   * @test  /nodynamiccopyright/
    42.5   * @bug 6214885
    42.6   * @summary This test exercises features provided by the new internal Diagnostics API
    42.7 - * @compile/fail/ref=T6214885a.out -XDstdout -XDdiags=%b:%l%_%t%m|%p%m T6214885.java
    42.8 - * @compile/fail/ref=T6214885b.out -XDstdout -XDdiags=%b:%l:%c%_%t%m|%p%m T6214885.java
    42.9 + * @compile/fail/ref=T6214885a.out -XDdiags=%b:%l%_%t%m|%p%m T6214885.java
   42.10 + * @compile/fail/ref=T6214885b.out -XDdiags=%b:%l:%c%_%t%m|%p%m T6214885.java
   42.11   */
   42.12  class T6214885
   42.13  {

    43.1 --- a/test/tools/javac/T6224167.java	Thu Jul 22 11:02:54 2010 -0700
    43.2 +++ b/test/tools/javac/T6224167.java	Mon Jul 26 14:18:45 2010 -0700
    43.3 @@ -3,7 +3,7 @@
    43.4   * @bug 6224167
    43.5   * @summary misleading error message when both array and varargs
    43.6   *      methods are defined
    43.7 - * @compile/fail/ref=T6224167.out -XDstdout -XDrawDiagnostics T6224167.java
    43.8 + * @compile/fail/ref=T6224167.out -XDrawDiagnostics T6224167.java
    43.9   */
   43.10  class T6224167
   43.11  {

    44.1 --- a/test/tools/javac/T6227617.java	Thu Jul 22 11:02:54 2010 -0700
    44.2 +++ b/test/tools/javac/T6227617.java	Mon Jul 26 14:18:45 2010 -0700
    44.3 @@ -3,7 +3,7 @@
    44.4   * @bug 6227617
    44.5   * @summary Lint option for redundant casts
    44.6   * @compile -Werror T6227617.java
    44.7 - * @compile/ref=T6227617.out -XDstdout -XDrawDiagnostics -Xlint:cast T6227617.java
    44.8 + * @compile/ref=T6227617.out -XDrawDiagnostics -Xlint:cast T6227617.java
    44.9   */
   44.10  import java.util.HashMap;
   44.11  import java.util.Map;

    45.1 --- a/test/tools/javac/T6230128.java	Thu Jul 22 11:02:54 2010 -0700
    45.2 +++ b/test/tools/javac/T6230128.java	Mon Jul 26 14:18:45 2010 -0700
    45.3 @@ -1,7 +1,7 @@
    45.4  /*
    45.5   * @test  /nodynamiccopyright/
    45.6   * @bug 6230128
    45.7 - * @compile/fail/ref=T6230128.out -XDstdout -XDrawDiagnostics T6230128.java
    45.8 + * @compile/fail/ref=T6230128.out -XDrawDiagnostics T6230128.java
    45.9   */
   45.10  class A1 {
   45.11      public void foo(Object[] args) { }

    46.1 --- a/test/tools/javac/T6231847.java	Thu Jul 22 11:02:54 2010 -0700
    46.2 +++ b/test/tools/javac/T6231847.java	Mon Jul 26 14:18:45 2010 -0700
    46.3 @@ -4,7 +4,7 @@
    46.4   * @summary Crash in com.sun.tools.javac.comp.Attr.visitNewClass:1352
    46.5   * @author  Peter von der Ah\u00e9
    46.6   * @compile/fail -XDdev T6231847.java
    46.7 - * @compile/fail/ref=T6231847.out -XDdev -XDrawDiagnostics -XDstdout T6231847.java
    46.8 + * @compile/fail/ref=T6231847.out -XDdev -XDrawDiagnostics T6231847.java
    46.9   */
   46.10  
   46.11  class T6231847 {

    47.1 --- a/test/tools/javac/T6241723.java	Thu Jul 22 11:02:54 2010 -0700
    47.2 +++ b/test/tools/javac/T6241723.java	Mon Jul 26 14:18:45 2010 -0700
    47.3 @@ -2,7 +2,7 @@
    47.4   * @test  /nodynamiccopyright/
    47.5   * @bug 6241723
    47.6   * @summary compiler can miss some references to at-Deprecated classes
    47.7 - * @compile/fail/ref=T6241723.out -XDstdout -XDrawDiagnostics -Xlint:deprecation -Werror T6241723.java
    47.8 + * @compile/fail/ref=T6241723.out -XDrawDiagnostics -Xlint:deprecation -Werror T6241723.java
    47.9   */
   47.10  
   47.11  @Deprecated class A1

    48.1 --- a/test/tools/javac/T6245591.java	Thu Jul 22 11:02:54 2010 -0700
    48.2 +++ b/test/tools/javac/T6245591.java	Mon Jul 26 14:18:45 2010 -0700
    48.3 @@ -1,7 +1,7 @@
    48.4  /*
    48.5   * @test  /nodynamiccopyright/
    48.6   * @bug 6245591
    48.7 - * @compile/ref=T6245591.out -XDstdout -XDrawDiagnostics -Xlint:all,-path T6245591.java
    48.8 + * @compile/ref=T6245591.out -XDrawDiagnostics -Xlint:all,-path T6245591.java
    48.9   */
   48.10  enum Season {
   48.11      /** @deprecated */

    49.1 --- a/test/tools/javac/T6247324.java	Thu Jul 22 11:02:54 2010 -0700
    49.2 +++ b/test/tools/javac/T6247324.java	Mon Jul 26 14:18:45 2010 -0700
    49.3 @@ -1,7 +1,7 @@
    49.4  /*
    49.5   * @test  /nodynamiccopyright/
    49.6   * @bug 6247324
    49.7 - * @compile/fail/ref=T6247324.out -XDrawDiagnostics -XDstdout -Xlint -Xlint:-path T6247324.java
    49.8 + * @compile/fail/ref=T6247324.out -XDrawDiagnostics -Xlint -Xlint:-path T6247324.java
    49.9   */
   49.10  class Pair<X,Y> {
   49.11      private X x;

    50.1 --- a/test/tools/javac/T6394563.java	Thu Jul 22 11:02:54 2010 -0700
    50.2 +++ b/test/tools/javac/T6394563.java	Mon Jul 26 14:18:45 2010 -0700
    50.3 @@ -3,13 +3,13 @@
    50.4   * @bug 6394563
    50.5   * @summary javac ignores -nowarn switch in 1.5.0_06 for deprecation warnings
    50.6   *
    50.7 - * @compile/ref=T6394563.note.out  -XDstdout -XDrawDiagnostics -nowarn             T6394563.java
    50.8 - * @compile/ref=T6394563.note.out  -XDstdout -XDrawDiagnostics -nowarn -source 1.5 T6394563.java
    50.9 - * @compile/ref=T6394563.empty.out -XDstdout -XDrawDiagnostics -nowarn -source 1.4 T6394563.java
   50.10 + * @compile/ref=T6394563.note.out  -XDrawDiagnostics -nowarn             T6394563.java
   50.11 + * @compile/ref=T6394563.note.out  -XDrawDiagnostics -nowarn -source 1.5 T6394563.java
   50.12 + * @compile/ref=T6394563.empty.out -XDrawDiagnostics -nowarn -source 1.4 T6394563.java
   50.13   *
   50.14 - * @compile/ref=T6394563.warn.out  -XDstdout -XDrawDiagnostics -Xlint -nowarn             T6394563.java
   50.15 - * @compile/ref=T6394563.warn.out  -XDstdout -XDrawDiagnostics -Xlint -nowarn -source 1.5 T6394563.java
   50.16 - * @compile/ref=T6394563.empty.out -XDstdout -XDrawDiagnostics -Xlint -nowarn -source 1.4 T6394563.java
   50.17 + * @compile/ref=T6394563.warn.out  -XDrawDiagnostics -Xlint -nowarn             T6394563.java
   50.18 + * @compile/ref=T6394563.warn.out  -XDrawDiagnostics -Xlint -nowarn -source 1.5 T6394563.java
   50.19 + * @compile/ref=T6394563.empty.out -XDrawDiagnostics -Xlint -nowarn -source 1.4 T6394563.java
   50.20   */
   50.21  
   50.22  class T6394563 {

    51.1 --- a/test/tools/javac/annotations/6214965/T6214965.java	Thu Jul 22 11:02:54 2010 -0700
    51.2 +++ b/test/tools/javac/annotations/6214965/T6214965.java	Mon Jul 26 14:18:45 2010 -0700
    51.3 @@ -27,5 +27,5 @@
    51.4   * @summary Compiler crash on redefing nested annotation types
    51.5   * @compile CompilerAnnotationTest.java CompilerAnnotationTest2.java
    51.6   * @compile CompilerAnnotationTest2bad.java
    51.7 - * @compile/ref=T6214965.out -XDstdout -XDrawDiagnostics CompilerAnnotationTest2bad.java
    51.8 + * @compile/ref=T6214965.out -XDrawDiagnostics CompilerAnnotationTest2bad.java
    51.9   */

    52.1 --- a/test/tools/javac/annotations/6365854/T6365854.java	Thu Jul 22 11:02:54 2010 -0700
    52.2 +++ b/test/tools/javac/annotations/6365854/T6365854.java	Mon Jul 26 14:18:45 2010 -0700
    52.3 @@ -33,11 +33,11 @@
    52.4   *
    52.5   * @compile TestAnnotation.java TestCore.java
    52.6   * @clean test.annotation.TestAnnotation
    52.7 - * @compile/ref=test1.out -XDstdout -XDrawDiagnostics T6365854.java
    52.8 + * @compile/ref=test1.out -XDrawDiagnostics T6365854.java
    52.9   * @run main T6365854
   52.10 - * @compile/ref=test2.out -XDstdout -XDrawDiagnostics evolve/TestAnnotation.java T6365854.java
   52.11 + * @compile/ref=test2.out -XDrawDiagnostics evolve/TestAnnotation.java T6365854.java
   52.12   * @run main T6365854
   52.13 - * @compile/ref=test2.out -XDstdout -XDrawDiagnostics T6365854.java
   52.14 + * @compile/ref=test2.out -XDrawDiagnostics T6365854.java
   52.15   * @run main T6365854
   52.16   */
   52.17  

    53.1 --- a/test/tools/javac/danglingDep/DepX.java	Thu Jul 22 11:02:54 2010 -0700
    53.2 +++ b/test/tools/javac/danglingDep/DepX.java	Mon Jul 26 14:18:45 2010 -0700
    53.3 @@ -25,7 +25,7 @@
    53.4   * control test (2): verify that compiler handles at-deprecated correctly
    53.5   * @test
    53.6   * @clean X DepX refX
    53.7 - * @compile/ref=DepX.out -XDstdout -XDrawDiagnostics DepX.java RefX.java
    53.8 + * @compile/ref=DepX.out -XDrawDiagnostics DepX.java RefX.java
    53.9   */
   53.10  class DepX
   53.11  {

    54.1 --- a/test/tools/javac/danglingDep/NoDepX.java	Thu Jul 22 11:02:54 2010 -0700
    54.2 +++ b/test/tools/javac/danglingDep/NoDepX.java	Mon Jul 26 14:18:45 2010 -0700
    54.3 @@ -25,7 +25,7 @@
    54.4   * control test (1): verify that compiler handles (lack of) at-deprecated correctly
    54.5   * @test
    54.6   * @clean NoDepX X RefX
    54.7 - * @compile/ref=NoDepX.out -XDstdout -XDrawDiagnostics NoDepX.java RefX.java
    54.8 + * @compile/ref=NoDepX.out -XDrawDiagnostics NoDepX.java RefX.java
    54.9   */
   54.10  class NoDepX
   54.11  {

    55.1 --- a/test/tools/javac/danglingDep/Test1.java	Thu Jul 22 11:02:54 2010 -0700
    55.2 +++ b/test/tools/javac/danglingDep/Test1.java	Mon Jul 26 14:18:45 2010 -0700
    55.3 @@ -25,7 +25,7 @@
    55.4   * @test
    55.5   * @bug 6213430
    55.6   * @clean Test1 X RefX
    55.7 - * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics Test1.java RefX.java
    55.8 + * @compile/ref=Test1.out -XDrawDiagnostics Test1.java RefX.java
    55.9   */
   55.10  class Test1
   55.11  {

    56.1 --- a/test/tools/javac/depDocComment/DeprecatedDocComment.java	Thu Jul 22 11:02:54 2010 -0700
    56.2 +++ b/test/tools/javac/depDocComment/DeprecatedDocComment.java	Mon Jul 26 14:18:45 2010 -0700
    56.3 @@ -6,7 +6,7 @@
    56.4   * @author Jing Qian
    56.5   *
    56.6   * @compile DeprecatedDocComment2.java
    56.7 - * @compile/fail/ref=DeprecatedDocComment.out -XDrawDiagnostics -XDstdout -Werror -deprecation DeprecatedDocComment.java
    56.8 + * @compile/fail/ref=DeprecatedDocComment.out -XDrawDiagnostics -Werror -deprecation DeprecatedDocComment.java
    56.9   */
   56.10  
   56.11  // WARNING: This file needs to be compiled with the -deprecation flag on.

    57.1 --- a/test/tools/javac/depDocComment/SuppressDeprecation.java	Thu Jul 22 11:02:54 2010 -0700
    57.2 +++ b/test/tools/javac/depDocComment/SuppressDeprecation.java	Mon Jul 26 14:18:45 2010 -0700
    57.3 @@ -4,7 +4,7 @@
    57.4   * @summary New rules for when deprecation messages are suppressed
    57.5   * @author gafter
    57.6   *
    57.7 - * @compile/ref=SuppressDeprecation.out -XDstdout -Xlint:deprecation -XDrawDiagnostics SuppressDeprecation.java
    57.8 + * @compile/ref=SuppressDeprecation.out -Xlint:deprecation -XDrawDiagnostics SuppressDeprecation.java
    57.9   */
   57.10  
   57.11  /* Test for the contexts in which deprecations warnings should

    58.1 --- a/test/tools/javac/depOverrides/annotation/Test1.java	Thu Jul 22 11:02:54 2010 -0700
    58.2 +++ b/test/tools/javac/depOverrides/annotation/Test1.java	Mon Jul 26 14:18:45 2010 -0700
    58.3 @@ -26,12 +26,12 @@
    58.4   * @bug 5086088
    58.5   * @summary check warnings generated when overriding deprecated methods
    58.6   *
    58.7 - * @compile/ref=empty       -XDstdout -XDrawDiagnostics -Xlint:deprecation I.java
    58.8 - * @compile/ref=Test1A.out  -XDstdout -XDrawDiagnostics -Xlint:deprecation A.java
    58.9 - * @compile/ref=Test1B.out  -XDstdout -XDrawDiagnostics -Xlint:deprecation B.java
   58.10 - * @compile/ref=Test1B2.out -XDstdout -XDrawDiagnostics -Xlint:deprecation B2.java
   58.11 - * @compile/ref=empty       -XDstdout -XDrawDiagnostics -Xlint:deprecation B3.java
   58.12 - * @compile/ref=empty       -XDstdout -XDrawDiagnostics -Xlint:deprecation Test1.java
   58.13 + * @compile/ref=empty       -XDrawDiagnostics -Xlint:deprecation I.java
   58.14 + * @compile/ref=Test1A.out  -XDrawDiagnostics -Xlint:deprecation A.java
   58.15 + * @compile/ref=Test1B.out  -XDrawDiagnostics -Xlint:deprecation B.java
   58.16 + * @compile/ref=Test1B2.out -XDrawDiagnostics -Xlint:deprecation B2.java
   58.17 + * @compile/ref=empty       -XDrawDiagnostics -Xlint:deprecation B3.java
   58.18 + * @compile/ref=empty       -XDrawDiagnostics -Xlint:deprecation Test1.java
   58.19   */
   58.20  
   58.21  

    59.1 --- a/test/tools/javac/depOverrides/annotation/Test2.java	Thu Jul 22 11:02:54 2010 -0700
    59.2 +++ b/test/tools/javac/depOverrides/annotation/Test2.java	Mon Jul 26 14:18:45 2010 -0700
    59.3 @@ -26,10 +26,10 @@
    59.4   * @bug 5086088
    59.5   * @summary check warnings generated when overriding deprecated methods
    59.6   *
    59.7 - * @compile/ref=empty   -XDstdout -XDrawDiagnostics -Xlint:deprecation P.java
    59.8 - * @compile/ref=Test2Q.out -XDstdout -XDrawDiagnostics -Xlint:deprecation Q.java
    59.9 - * @compile/ref=Test2R.out -XDstdout -XDrawDiagnostics -Xlint:deprecation R.java
   59.10 - * @compile/ref=empty   -XDstdout -XDrawDiagnostics -Xlint:deprecation Test2.java
   59.11 + * @compile/ref=empty   -XDrawDiagnostics -Xlint:deprecation P.java
   59.12 + * @compile/ref=Test2Q.out -XDrawDiagnostics -Xlint:deprecation Q.java
   59.13 + * @compile/ref=Test2R.out -XDrawDiagnostics -Xlint:deprecation R.java
   59.14 + * @compile/ref=empty   -XDrawDiagnostics -Xlint:deprecation Test2.java
   59.15   */
   59.16  
   59.17  

    60.1 --- a/test/tools/javac/depOverrides/annotation/Test3.java	Thu Jul 22 11:02:54 2010 -0700
    60.2 +++ b/test/tools/javac/depOverrides/annotation/Test3.java	Mon Jul 26 14:18:45 2010 -0700
    60.3 @@ -3,7 +3,7 @@
    60.4   * @bug 5086088
    60.5   * @summary check warnings generated when overriding deprecated methods
    60.6   *
    60.7 - * @compile/ref=Test3.out -XDstdout -XDrawDiagnostics -Xlint:deprecation Test3.java
    60.8 + * @compile/ref=Test3.out -XDrawDiagnostics -Xlint:deprecation Test3.java
    60.9   */
   60.10  
   60.11  interface LibInterface {

    61.1 --- a/test/tools/javac/depOverrides/doccomment/Test1.java	Thu Jul 22 11:02:54 2010 -0700
    61.2 +++ b/test/tools/javac/depOverrides/doccomment/Test1.java	Mon Jul 26 14:18:45 2010 -0700
    61.3 @@ -26,12 +26,12 @@
    61.4   * @bug 5086088
    61.5   * @summary check warnings generated when overriding deprecated methods
    61.6   *
    61.7 - * @compile/ref=empty    -XDstdout -XDrawDiagnostics -Xlint:deprecation I.java
    61.8 - * @compile/ref=Test1A.out  -XDstdout -XDrawDiagnostics -Xlint:deprecation A.java
    61.9 - * @compile/ref=Test1B.out  -XDstdout -XDrawDiagnostics -Xlint:deprecation B.java
   61.10 - * @compile/ref=Test1B2.out -XDstdout -XDrawDiagnostics -Xlint:deprecation B2.java
   61.11 - * @compile/ref=empty    -XDstdout -XDrawDiagnostics -Xlint:deprecation B3.java
   61.12 - * @compile/ref=empty    -XDstdout -XDrawDiagnostics -Xlint:deprecation Test1.java
   61.13 + * @compile/ref=empty    -XDrawDiagnostics -Xlint:deprecation I.java
   61.14 + * @compile/ref=Test1A.out  -XDrawDiagnostics -Xlint:deprecation A.java
   61.15 + * @compile/ref=Test1B.out  -XDrawDiagnostics -Xlint:deprecation B.java
   61.16 + * @compile/ref=Test1B2.out -XDrawDiagnostics -Xlint:deprecation B2.java
   61.17 + * @compile/ref=empty    -XDrawDiagnostics -Xlint:deprecation B3.java
   61.18 + * @compile/ref=empty    -XDrawDiagnostics -Xlint:deprecation Test1.java
   61.19   */
   61.20  
   61.21  

    62.1 --- a/test/tools/javac/depOverrides/doccomment/Test2.java	Thu Jul 22 11:02:54 2010 -0700
    62.2 +++ b/test/tools/javac/depOverrides/doccomment/Test2.java	Mon Jul 26 14:18:45 2010 -0700
    62.3 @@ -26,10 +26,10 @@
    62.4   * @bug 5086088
    62.5   * @summary check warnings generated when overriding deprecated methods
    62.6   *
    62.7 - * @compile/ref=empty   -XDstdout -XDrawDiagnostics -Xlint:deprecation P.java
    62.8 - * @compile/ref=Test2Q.out -XDstdout -XDrawDiagnostics -Xlint:deprecation Q.java
    62.9 - * @compile/ref=Test2R.out -XDstdout -XDrawDiagnostics -Xlint:deprecation R.java
   62.10 - * @compile/ref=empty   -XDstdout -XDrawDiagnostics -Xlint:deprecation Test2.java
   62.11 + * @compile/ref=empty   -XDrawDiagnostics -Xlint:deprecation P.java
   62.12 + * @compile/ref=Test2Q.out -XDrawDiagnostics -Xlint:deprecation Q.java
   62.13 + * @compile/ref=Test2R.out -XDrawDiagnostics -Xlint:deprecation R.java
   62.14 + * @compile/ref=empty   -XDrawDiagnostics -Xlint:deprecation Test2.java
   62.15   */
   62.16  
   62.17  

    63.1 --- a/test/tools/javac/depOverrides/doccomment/Test3.java	Thu Jul 22 11:02:54 2010 -0700
    63.2 +++ b/test/tools/javac/depOverrides/doccomment/Test3.java	Mon Jul 26 14:18:45 2010 -0700
    63.3 @@ -3,7 +3,7 @@
    63.4   * @bug 5086088
    63.5   * @summary check warnings generated when overriding deprecated methods
    63.6   *
    63.7 - * @compile/ref=Test3.out -XDstdout -XDrawDiagnostics -Xlint:deprecation Test3.java
    63.8 + * @compile/ref=Test3.out -XDrawDiagnostics -Xlint:deprecation Test3.java
    63.9   */
   63.10  
   63.11  interface LibInterface {

    64.1 --- a/test/tools/javac/enum/6384542/T6384542.java	Thu Jul 22 11:02:54 2010 -0700
    64.2 +++ b/test/tools/javac/enum/6384542/T6384542.java	Mon Jul 26 14:18:45 2010 -0700
    64.3 @@ -4,7 +4,7 @@
    64.4   * @summary crash: test/tools/javac/versions/check.sh
    64.5   * @author  Peter von der Ah\u00e9
    64.6   * @compile/fail -source 1.4 T6384542.java
    64.7 - * @compile/fail/ref=T6384542.out -source 1.4 -XDstdout -XDrawDiagnostics T6384542.java
    64.8 + * @compile/fail/ref=T6384542.out -source 1.4 -XDrawDiagnostics T6384542.java
    64.9   */
   64.10  
   64.11  import static java.lang.Math.sin;

    65.1 --- a/test/tools/javac/enum/6384542/T6384542a.java	Thu Jul 22 11:02:54 2010 -0700
    65.2 +++ b/test/tools/javac/enum/6384542/T6384542a.java	Mon Jul 26 14:18:45 2010 -0700
    65.3 @@ -5,8 +5,8 @@
    65.4   * @author  Peter von der Ah\u00e9
    65.5   * @compile/fail -source 5   T6384542a.java
    65.6   * @compile      -source 1.4 T6384542a.java
    65.7 - * @compile/fail/ref=T6384542a_5.out -source 5   -XDstdout -XDrawDiagnostics T6384542a.java
    65.8 - * @compile/ref=T6384542a_1_4.out    -source 1.4 -XDstdout -XDrawDiagnostics T6384542a.java
    65.9 + * @compile/fail/ref=T6384542a_5.out -source 5   -XDrawDiagnostics T6384542a.java
   65.10 + * @compile/ref=T6384542a_1_4.out    -source 1.4 -XDrawDiagnostics T6384542a.java
   65.11   */
   65.12  
   65.13  public class T6384542a {

    66.1 --- a/test/tools/javac/enum/forwardRef/T6425594.java	Thu Jul 22 11:02:54 2010 -0700
    66.2 +++ b/test/tools/javac/enum/forwardRef/T6425594.java	Mon Jul 26 14:18:45 2010 -0700
    66.3 @@ -3,7 +3,7 @@
    66.4   * @bug     6424491
    66.5   * @summary javac accepts illegal forward references
    66.6   * @author  Peter von der Ah\u00e9
    66.7 - * @compile/fail/ref=T6425594.out -XDstdout -XDrawDiagnostics -XDuseBeforeDeclarationWarning T6425594.java
    66.8 + * @compile/fail/ref=T6425594.out -XDrawDiagnostics -XDuseBeforeDeclarationWarning T6425594.java
    66.9   */
   66.10  
   66.11  public class T6425594 {

    67.1 --- a/test/tools/javac/generics/5009937/T5009937.java	Thu Jul 22 11:02:54 2010 -0700
    67.2 +++ b/test/tools/javac/generics/5009937/T5009937.java	Mon Jul 26 14:18:45 2010 -0700
    67.3 @@ -4,7 +4,7 @@
    67.4   * @summary hiding versus generics versus binary compatibility
    67.5   * @author Maurizio Cimadamore
    67.6   *
    67.7 - * @compile/fail/ref=T5009937.out -XDstdout -XDrawDiagnostics T5009937.java
    67.8 + * @compile/fail/ref=T5009937.out -XDrawDiagnostics T5009937.java
    67.9   */
   67.10  
   67.11  public class T5009937<X> {

    68.1 --- a/test/tools/javac/generics/6207386/T6207386.java	Thu Jul 22 11:02:54 2010 -0700
    68.2 +++ b/test/tools/javac/generics/6207386/T6207386.java	Mon Jul 26 14:18:45 2010 -0700
    68.3 @@ -3,7 +3,7 @@
    68.4   * @bug     6207386
    68.5   * @summary Undecidable type system leads to crash
    68.6   * @author  Martin Odersky
    68.7 - * @compile/fail/ref=T6207386.out -XDstdout -XDrawDiagnostics T6207386.java
    68.8 + * @compile/fail/ref=T6207386.out -XDrawDiagnostics T6207386.java
    68.9   */
   68.10  
   68.11  public class T6207386 {

    69.1 --- a/test/tools/javac/generics/6359951/T6359951.java	Thu Jul 22 11:02:54 2010 -0700
    69.2 +++ b/test/tools/javac/generics/6359951/T6359951.java	Mon Jul 26 14:18:45 2010 -0700
    69.3 @@ -4,7 +4,7 @@
    69.4   * @summary Crash when using class field
    69.5   *
    69.6   *
    69.7 - * @compile/fail/ref=T6359951.out -XDstdout -XDrawDiagnostics T6359951.java
    69.8 + * @compile/fail/ref=T6359951.out -XDrawDiagnostics T6359951.java
    69.9   */
   69.10  
   69.11  public class T6359951 {

    70.1 --- a/test/tools/javac/generics/6677785/T6677785.java	Thu Jul 22 11:02:54 2010 -0700
    70.2 +++ b/test/tools/javac/generics/6677785/T6677785.java	Mon Jul 26 14:18:45 2010 -0700
    70.3 @@ -3,7 +3,7 @@
    70.4   * @bug     6677785
    70.5   * @summary REGRESSION: StackOverFlowError with Cyclic Class level Type Parameters when used in constructors
    70.6   * @author Maurizio Cimadamore
    70.7 - * @compile/fail/ref=T6677785.out -XDstdout -XDrawDiagnostics T6677785.java
    70.8 + * @compile/fail/ref=T6677785.out -XDrawDiagnostics T6677785.java
    70.9   */
   70.10  public class T6677785<E extends T, T extends E> {
   70.11       T6677785() {}

    71.1 --- a/test/tools/javac/generics/6723444/T6723444.java	Thu Jul 22 11:02:54 2010 -0700
    71.2 +++ b/test/tools/javac/generics/6723444/T6723444.java	Mon Jul 26 14:18:45 2010 -0700
    71.3 @@ -4,7 +4,7 @@
    71.4   *
    71.5   * @summary javac fails to substitute type variables into a constructor's throws clause
    71.6   * @author Mark Mahieu
    71.7 - * @compile/fail/ref=T6723444.out -XDstdout -XDrawDiagnostics T6723444.java
    71.8 + * @compile/fail/ref=T6723444.out -XDrawDiagnostics T6723444.java
    71.9   *
   71.10   */
   71.11  public class T6723444 {

    72.1 --- a/test/tools/javac/generics/inference/6611449/T6611449.java	Thu Jul 22 11:02:54 2010 -0700
    72.2 +++ b/test/tools/javac/generics/inference/6611449/T6611449.java	Mon Jul 26 14:18:45 2010 -0700
    72.3 @@ -2,7 +2,7 @@
    72.4   * @test /nodynamiccopyright/
    72.5   * @bug 6611449
    72.6   * @summary Internal Error thrown during generic method/constructor invocation
    72.7 - * @compile/fail/ref=T6611449.out -XDstdout -XDrawDiagnostics T6611449.java
    72.8 + * @compile/fail/ref=T6611449.out -XDrawDiagnostics T6611449.java
    72.9   */
   72.10  public class T6611449<S> {
   72.11  

    73.1 --- a/test/tools/javac/generics/inference/6718364/T6718364.java	Thu Jul 22 11:02:54 2010 -0700
    73.2 +++ b/test/tools/javac/generics/inference/6718364/T6718364.java	Mon Jul 26 14:18:45 2010 -0700
    73.3 @@ -2,7 +2,7 @@
    73.4   * @test /nodynamiccopyright/
    73.5   * @bug 6718364
    73.6   * @summary inference fails when a generic method is invoked with raw arguments
    73.7 - * @compile/ref=T6718364.out -XDstdout -XDrawDiagnostics -Xlint:unchecked T6718364.java
    73.8 + * @compile/ref=T6718364.out -XDrawDiagnostics -Xlint:unchecked T6718364.java
    73.9   */
   73.10  class T6718364 {
   73.11      class X<T> {}

    74.1 --- a/test/tools/javac/generics/wildcards/6437894/T6437894.java	Thu Jul 22 11:02:54 2010 -0700
    74.2 +++ b/test/tools/javac/generics/wildcards/6437894/T6437894.java	Mon Jul 26 14:18:45 2010 -0700
    74.3 @@ -6,7 +6,7 @@
    74.4   * @author  Peter von der Ah\u00e9
    74.5   * @compile A.java B.java
    74.6   * @clean   a.A
    74.7 - * @compile/fail/ref=T6437894.out -XDstdout -XDrawDiagnostics T6437894.java
    74.8 + * @compile/fail/ref=T6437894.out -XDrawDiagnostics T6437894.java
    74.9   */
   74.10  
   74.11  public class T6437894 {

    75.1 --- a/test/tools/javac/lint/NoWarn.java	Thu Jul 22 11:02:54 2010 -0700
    75.2 +++ b/test/tools/javac/lint/NoWarn.java	Mon Jul 26 14:18:45 2010 -0700
    75.3 @@ -2,9 +2,9 @@
    75.4   * @test  /nodynamiccopyright/
    75.5   * @bug 6183484
    75.6   * @summary verify -nowarn is the same as -Xlint:none
    75.7 - * @compile/ref=NoWarn1.out -XDstdout -XDrawDiagnostics             NoWarn.java
    75.8 - * @compile/ref=NoWarn2.out -XDstdout -XDrawDiagnostics -nowarn     NoWarn.java
    75.9 - * @compile/ref=NoWarn2.out -XDstdout -XDrawDiagnostics -Xlint:none NoWarn.java
   75.10 + * @compile/ref=NoWarn1.out -XDrawDiagnostics             NoWarn.java
   75.11 + * @compile/ref=NoWarn2.out -XDrawDiagnostics -nowarn     NoWarn.java
   75.12 + * @compile/ref=NoWarn2.out -XDrawDiagnostics -Xlint:none NoWarn.java
   75.13   */
   75.14  
   75.15  class NoWarn {

    76.1 --- a/test/tools/javac/mandatoryWarnings/deprecated/Test.java	Thu Jul 22 11:02:54 2010 -0700
    76.2 +++ b/test/tools/javac/mandatoryWarnings/deprecated/Test.java	Mon Jul 26 14:18:45 2010 -0700
    76.3 @@ -28,110 +28,110 @@
    76.4   * @test
    76.5   * @bug 5047307
    76.6   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
    76.7 - * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics A.java
    76.8 + * @compile/ref=Test1.out -XDrawDiagnostics A.java
    76.9   */
   76.10  
   76.11  /*
   76.12   * @test
   76.13   * @bug 5047307
   76.14   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   76.15 - * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics -nowarn A.java
   76.16 + * @compile/ref=Test1.out -XDrawDiagnostics -nowarn A.java
   76.17   */
   76.18  
   76.19  /*
   76.20   * @test
   76.21   * @bug 5047307
   76.22   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   76.23 - * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics -Xmaxwarns 1 A.java
   76.24 + * @compile/ref=Test1.out -XDrawDiagnostics -Xmaxwarns 1 A.java
   76.25   */
   76.26  
   76.27  /*
   76.28   * @test
   76.29   * @bug 5047307
   76.30   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   76.31 - * @compile/ref=Test2.out -XDstdout -XDrawDiagnostics A.java B.java
   76.32 + * @compile/ref=Test2.out -XDrawDiagnostics A.java B.java
   76.33   */
   76.34  
   76.35  /*
   76.36   * @test
   76.37   * @bug 5047307
   76.38   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   76.39 - * @compile/ref=Test2.out -XDstdout -XDrawDiagnostics -nowarn A.java B.java
   76.40 + * @compile/ref=Test2.out -XDrawDiagnostics -nowarn A.java B.java
   76.41   */
   76.42  
   76.43  /*
   76.44   * @test
   76.45   * @bug 5047307
   76.46   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   76.47 - * @compile/ref=Test2.out -XDstdout -XDrawDiagnostics -Xmaxwarns 1 A.java B.java
   76.48 + * @compile/ref=Test2.out -XDrawDiagnostics -Xmaxwarns 1 A.java B.java
   76.49   */
   76.50  
   76.51  /*
   76.52   * @test
   76.53   * @bug 5047307
   76.54   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   76.55 - * @compile/ref=Test3.out -XDstdout -XDrawDiagnostics -Xlint:deprecation A.java
   76.56 + * @compile/ref=Test3.out -XDrawDiagnostics -Xlint:deprecation A.java
   76.57   */
   76.58  
   76.59  /*
   76.60   * @test
   76.61   * @bug 5047307
   76.62   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   76.63 - * @compile/ref=Test3.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:deprecation A.java
   76.64 + * @compile/ref=Test3.out -XDrawDiagnostics -nowarn -Xlint:deprecation A.java
   76.65   */
   76.66  
   76.67  /*
   76.68   * @test
   76.69   * @bug 5047307
   76.70   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   76.71 - * @compile/ref=Test3b.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 1 A.java
   76.72 + * @compile/ref=Test3b.out -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 1 A.java
   76.73   */
   76.74  
   76.75  /*
   76.76   * @test
   76.77   * @bug 5047307
   76.78   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   76.79 - * @compile/ref=Test4.out -XDstdout -XDrawDiagnostics -Xlint:deprecation A.java B.java
   76.80 + * @compile/ref=Test4.out -XDrawDiagnostics -Xlint:deprecation A.java B.java
   76.81   */
   76.82  
   76.83  /*
   76.84   * @test
   76.85   * @bug 5047307
   76.86   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   76.87 - * @compile/ref=Test4.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:deprecation A.java B.java
   76.88 + * @compile/ref=Test4.out -XDrawDiagnostics -nowarn -Xlint:deprecation A.java B.java
   76.89   */
   76.90  
   76.91  /*
   76.92   * @test
   76.93   * @bug 5047307
   76.94   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   76.95 - * @compile/ref=Test4b.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 1 A.java B.java
   76.96 + * @compile/ref=Test4b.out -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 1 A.java B.java
   76.97   */
   76.98  
   76.99  /*
  76.100   * @test
  76.101   * @bug 5047307
  76.102   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
  76.103 - * @compile/ref=Test4c.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 2 A.java B.java
  76.104 + * @compile/ref=Test4c.out -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 2 A.java B.java
  76.105   */
  76.106  
  76.107  /*
  76.108   * @test
  76.109   * @bug 5047307
  76.110   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
  76.111 - * @compile/ref=Test4d.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 3 A.java B.java
  76.112 + * @compile/ref=Test4d.out -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 3 A.java B.java
  76.113   */
  76.114  
  76.115  /*
  76.116   * @test
  76.117   * @bug 5047307
  76.118   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
  76.119 - * @compile/ref=Test5.out -XDstdout -XDrawDiagnostics -Xlint:deprecation  P.java Q.java
  76.120 + * @compile/ref=Test5.out -XDrawDiagnostics -Xlint:deprecation  P.java Q.java
  76.121   */
  76.122  
  76.123  /*
  76.124   * @test
  76.125   * @bug 5047307
  76.126   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
  76.127 - * @compile/ref=Test5b.out -XDstdout -XDrawDiagnostics -Xlint:deprecation -Xmaxwarns 2 P.java Q.java
  76.128 + * @compile/ref=Test5b.out -XDrawDiagnostics -Xlint:deprecation -Xmaxwarns 2 P.java Q.java
  76.129   */

    77.1 --- a/test/tools/javac/mandatoryWarnings/unchecked/Test.java	Thu Jul 22 11:02:54 2010 -0700
    77.2 +++ b/test/tools/javac/mandatoryWarnings/unchecked/Test.java	Mon Jul 26 14:18:45 2010 -0700
    77.3 @@ -28,96 +28,96 @@
    77.4   * @test
    77.5   * @bug 5047307
    77.6   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
    77.7 - * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics A.java
    77.8 + * @compile/ref=Test1.out -XDrawDiagnostics A.java
    77.9   */
   77.10  
   77.11  /*
   77.12   * @test
   77.13   * @bug 5047307
   77.14   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   77.15 - * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics -nowarn A.java
   77.16 + * @compile/ref=Test1.out -XDrawDiagnostics -nowarn A.java
   77.17   */
   77.18  
   77.19  /*
   77.20   * @test
   77.21   * @bug 5047307
   77.22   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   77.23 - * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics -Xmaxwarns 1 A.java
   77.24 + * @compile/ref=Test1.out -XDrawDiagnostics -Xmaxwarns 1 A.java
   77.25   */
   77.26  
   77.27  /*
   77.28   * @test
   77.29   * @bug 5047307
   77.30   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   77.31 - * @compile/ref=Test2.out -XDstdout -XDrawDiagnostics A.java B.java
   77.32 + * @compile/ref=Test2.out -XDrawDiagnostics A.java B.java
   77.33   */
   77.34  
   77.35  /*
   77.36   * @test
   77.37   * @bug 5047307
   77.38   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   77.39 - * @compile/ref=Test2.out -XDstdout -XDrawDiagnostics -nowarn A.java B.java
   77.40 + * @compile/ref=Test2.out -XDrawDiagnostics -nowarn A.java B.java
   77.41   */
   77.42  
   77.43  /*
   77.44   * @test
   77.45   * @bug 5047307
   77.46   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   77.47 - * @compile/ref=Test2.out -XDstdout -XDrawDiagnostics -Xmaxwarns 1 A.java B.java
   77.48 + * @compile/ref=Test2.out -XDrawDiagnostics -Xmaxwarns 1 A.java B.java
   77.49   */
   77.50  
   77.51  /*
   77.52   * @test
   77.53   * @bug 5047307
   77.54   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   77.55 - * @compile/ref=Test3.out -XDstdout -XDrawDiagnostics -Xlint:unchecked A.java
   77.56 + * @compile/ref=Test3.out -XDrawDiagnostics -Xlint:unchecked A.java
   77.57   */
   77.58  
   77.59  /*
   77.60   * @test
   77.61   * @bug 5047307
   77.62   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   77.63 - * @compile/ref=Test3.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:unchecked A.java
   77.64 + * @compile/ref=Test3.out -XDrawDiagnostics -nowarn -Xlint:unchecked A.java
   77.65   */
   77.66  
   77.67  /*
   77.68   * @test
   77.69   * @bug 5047307
   77.70   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   77.71 - * @compile/ref=Test3b.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 1 A.java
   77.72 + * @compile/ref=Test3b.out -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 1 A.java
   77.73   */
   77.74  
   77.75  /*
   77.76   * @test
   77.77   * @bug 5047307
   77.78   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   77.79 - * @compile/ref=Test4.out -XDstdout -XDrawDiagnostics -Xlint:unchecked A.java B.java
   77.80 + * @compile/ref=Test4.out -XDrawDiagnostics -Xlint:unchecked A.java B.java
   77.81   */
   77.82  
   77.83  /*
   77.84   * @test
   77.85   * @bug 5047307
   77.86   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   77.87 - * @compile/ref=Test4.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:unchecked A.java B.java
   77.88 + * @compile/ref=Test4.out -XDrawDiagnostics -nowarn -Xlint:unchecked A.java B.java
   77.89   */
   77.90  
   77.91  /*
   77.92   * @test
   77.93   * @bug 5047307
   77.94   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
   77.95 - * @compile/ref=Test4b.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 1 A.java B.java
   77.96 + * @compile/ref=Test4b.out -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 1 A.java B.java
   77.97   */
   77.98  
   77.99  /*
  77.100   * @test
  77.101   * @bug 5047307
  77.102   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
  77.103 - * @compile/ref=Test4c.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 2 A.java B.java
  77.104 + * @compile/ref=Test4c.out -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 2 A.java B.java
  77.105   */
  77.106  
  77.107  /*
  77.108   * @test
  77.109   * @bug 5047307
  77.110   * @summary javac -nowarn improperly suppresses JLS-mandated warnings
  77.111 - * @compile/ref=Test4d.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 3 A.java B.java
  77.112 + * @compile/ref=Test4d.out -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 3 A.java B.java
  77.113   */

    78.1 --- a/test/tools/javac/miranda/T4666866.java	Thu Jul 22 11:02:54 2010 -0700
    78.2 +++ b/test/tools/javac/miranda/T4666866.java	Mon Jul 26 14:18:45 2010 -0700
    78.3 @@ -4,7 +4,7 @@
    78.4   * @summary REGRESSION: Generated error message unhelpful for missing methods
    78.5   * @author gafter
    78.6   *
    78.7 - * @compile/fail/ref=T4666866.out -XDstdout -XDrawDiagnostics T4666866.java
    78.8 + * @compile/fail/ref=T4666866.out -XDrawDiagnostics T4666866.java
    78.9   */
   78.10  
   78.11  class t implements Runnable {}

    79.1 --- a/test/tools/javac/missingSuperRecovery/MissingSuperRecovery.java	Thu Jul 22 11:02:54 2010 -0700
    79.2 +++ b/test/tools/javac/missingSuperRecovery/MissingSuperRecovery.java	Mon Jul 26 14:18:45 2010 -0700
    79.3 @@ -5,7 +5,7 @@
    79.4   * class is no longer available during a subsequent compilation.
    79.5   * @author maddox
    79.6   *
    79.7 - * @compile/fail/ref=MissingSuperRecovery.out -XDstdout -XDdiags=%b:%l:%_%m MissingSuperRecovery.java
    79.8 + * @compile/fail/ref=MissingSuperRecovery.out -XDdiags=%b:%l:%_%m MissingSuperRecovery.java
    79.9   */
   79.10  
   79.11  // Requires "golden" class file 'impl.class', which contains

    80.1 --- a/test/tools/javac/policy/test1/Test1a.java	Thu Jul 22 11:02:54 2010 -0700
    80.2 +++ b/test/tools/javac/policy/test1/Test1a.java	Mon Jul 26 14:18:45 2010 -0700
    80.3 @@ -35,7 +35,7 @@
    80.4   * @summary provide variable policies for javac operation
    80.5   *              Default compile policy is now "by file" (reverted to "todo" for 6382700)
    80.6   *              Because of attr errors in B, no code should be generated
    80.7 - * @compile/fail/ref=bytodo.ABD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy A.java B.java D.java
    80.8 + * @compile/fail/ref=bytodo.ABD.out -XDrawDiagnostics -XDverboseCompilePolicy A.java B.java D.java
    80.9   */
   80.10  
   80.11  /*
   80.12 @@ -43,7 +43,7 @@
   80.13   * @bug 6260188
   80.14   * @summary provide variable policies for javac operation
   80.15   *              Generate code for A, A1, A2, B
   80.16 - * @compile/fail/ref=bytodo.ABD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=bytodo A.java B.java D.java
   80.17 + * @compile/fail/ref=bytodo.ABD.out -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=bytodo A.java B.java D.java
   80.18   */
   80.19  
   80.20  /*
   80.21 @@ -51,7 +51,7 @@
   80.22   * @bug 6260188
   80.23   * @summary provide variable policies for javac operation
   80.24   *              Because of attr errors in B, no code should be generated
   80.25 - * @compile/fail/ref=simple.ABD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=simple A.java B.java D.java
   80.26 + * @compile/fail/ref=simple.ABD.out -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=simple A.java B.java D.java
   80.27   */
   80.28  
   80.29  /*
   80.30 @@ -59,7 +59,7 @@
   80.31   * @bug 6260188
   80.32   * @summary provide variable policies for javac operation
   80.33   *              Because of attr errors in B, no code should be generated
   80.34 - * @compile/fail/ref=byfile.ABD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=byfile A.java B.java D.java
   80.35 + * @compile/fail/ref=byfile.ABD.out -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=byfile A.java B.java D.java
   80.36   */
   80.37  
   80.38  
   80.39 @@ -71,7 +71,7 @@
   80.40   * @summary provide variable policies for javac operation
   80.41   *              Default compile policy is now "by file" (reverted to "todo" for 6382700)
   80.42   *              Generate code for A, A1, A2, but because of flow errors in C, no more code should be generated
   80.43 - * @compile/fail/ref=bytodo.ACD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy A.java C.java D.java
   80.44 + * @compile/fail/ref=bytodo.ACD.out -XDrawDiagnostics -XDverboseCompilePolicy A.java C.java D.java
   80.45   */
   80.46  
   80.47  /*
   80.48 @@ -79,7 +79,7 @@
   80.49   * @bug 6260188
   80.50   * @summary provide variable policies for javac operation
   80.51   *              Generate code for A, A1, A2, C
   80.52 - * @compile/fail/ref=bytodo.ACD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=bytodo A.java C.java D.java
   80.53 + * @compile/fail/ref=bytodo.ACD.out -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=bytodo A.java C.java D.java
   80.54   */
   80.55  
   80.56  /*
   80.57 @@ -87,7 +87,7 @@
   80.58   * @bug 6260188
   80.59   * @summary provide variable policies for javac operation
   80.60   *              Because of flow errors in C, no code should be generated
   80.61 - * @compile/fail/ref=simple.ACD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=simple A.java C.java D.java
   80.62 + * @compile/fail/ref=simple.ACD.out -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=simple A.java C.java D.java
   80.63   */
   80.64  
   80.65  /*
   80.66 @@ -95,5 +95,5 @@
   80.67   * @bug 6260188
   80.68   * @summary provide variable policies for javac operation
   80.69   *              Generate code for A, A1, A2, but because of flow errors in C, no more code should be generated
   80.70 - * @compile/fail/ref=byfile.ACD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=byfile A.java C.java D.java
   80.71 + * @compile/fail/ref=byfile.ACD.out -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=byfile A.java C.java D.java
   80.72   */

    81.1 --- a/test/tools/javac/policy/test2/Test.java	Thu Jul 22 11:02:54 2010 -0700
    81.2 +++ b/test/tools/javac/policy/test2/Test.java	Mon Jul 26 14:18:45 2010 -0700
    81.3 @@ -23,20 +23,20 @@
    81.4  
    81.5  /*
    81.6   * @test
    81.7 - * @compile/ref=byfile.AB.out -XDstdout -XDverboseCompilePolicy -XDcompile.policy=byfile A.java B.java
    81.8 + * @compile/ref=byfile.AB.out -XDverboseCompilePolicy -XDcompile.policy=byfile A.java B.java
    81.9   */
   81.10  
   81.11  /*
   81.12   * @test
   81.13 - * @compile/ref=byfile.BA.out -XDstdout -XDverboseCompilePolicy -XDcompile.policy=byfile B.java A.java
   81.14 + * @compile/ref=byfile.BA.out -XDverboseCompilePolicy -XDcompile.policy=byfile B.java A.java
   81.15   */
   81.16  
   81.17  /*
   81.18   * @test
   81.19 - * @compile/ref=bytodo.AB.out -XDstdout -XDverboseCompilePolicy -XDcompile.policy=bytodo A.java B.java
   81.20 + * @compile/ref=bytodo.AB.out -XDverboseCompilePolicy -XDcompile.policy=bytodo A.java B.java
   81.21   */
   81.22  
   81.23  /*
   81.24   * @test
   81.25 - * @compile/ref=bytodo.BA.out -XDstdout -XDverboseCompilePolicy -XDcompile.policy=bytodo B.java A.java
   81.26 + * @compile/ref=bytodo.BA.out -XDverboseCompilePolicy -XDcompile.policy=bytodo B.java A.java
   81.27   */

    82.1 --- a/test/tools/javac/positions/T6253161.java	Thu Jul 22 11:02:54 2010 -0700
    82.2 +++ b/test/tools/javac/positions/T6253161.java	Mon Jul 26 14:18:45 2010 -0700
    82.3 @@ -4,7 +4,7 @@
    82.4   * @summary Compiler will fail to find the correct location of serial warnings for anonymous inner classes
    82.5   * @author  Seetharama Avadhanam
    82.6   * @compile -Xlint:serial -XDdev T6253161.java
    82.7 - * @compile/ref=T6253161.out -Xlint:serial -XDdev -XDrawDiagnostics -XDstdout T6253161.java
    82.8 + * @compile/ref=T6253161.out -Xlint:serial -XDdev -XDrawDiagnostics T6253161.java
    82.9   */
   82.10  import java.util.List;
   82.11  import java.util.ArrayList;

    83.1 --- a/test/tools/javac/positions/T6253161a.java	Thu Jul 22 11:02:54 2010 -0700
    83.2 +++ b/test/tools/javac/positions/T6253161a.java	Mon Jul 26 14:18:45 2010 -0700
    83.3 @@ -4,7 +4,7 @@
    83.4   * @summary Compiler will fail to find the correct location of serial warnings for anonymous inner classes
    83.5   * @author  Seetharama Avadhanam
    83.6   * @compile -Xlint:serial -XDdev T6253161a.java
    83.7 - * @compile/ref=T6253161a.out -Xlint:serial -XDdev -XDrawDiagnostics -XDstdout T6253161a.java
    83.8 + * @compile/ref=T6253161a.out -Xlint:serial -XDdev -XDrawDiagnostics T6253161a.java
    83.9   */
   83.10  import java.util.List;
   83.11  import java.util.ArrayList;

    84.1 --- a/test/tools/javac/positions/T6264029.java	Thu Jul 22 11:02:54 2010 -0700
    84.2 +++ b/test/tools/javac/positions/T6264029.java	Mon Jul 26 14:18:45 2010 -0700
    84.3 @@ -4,7 +4,7 @@
    84.4   * @summary Compiler issues wrong unchecked warning for anonymous inner class
    84.5   * @author  Seetharama Avadhanam
    84.6   * @compile -Xlint:unchecked -XDdev T6264029.java
    84.7 - * @compile/ref=T6264029.out -Xlint:unchecked -XDdev -XDrawDiagnostics -XDstdout T6264029.java
    84.8 + * @compile/ref=T6264029.out -Xlint:unchecked -XDdev -XDrawDiagnostics T6264029.java
    84.9   */
   84.10  
   84.11  class T6264029A<T,K> {

    85.1 --- a/test/tools/javac/processing/messager/6362067/T6362067.java	Thu Jul 22 11:02:54 2010 -0700
    85.2 +++ b/test/tools/javac/processing/messager/6362067/T6362067.java	Mon Jul 26 14:18:45 2010 -0700
    85.3 @@ -4,7 +4,7 @@
    85.4   * @summary Messager methods do not print out source position information
    85.5   * @build   T6362067
    85.6   * @compile -processor T6362067 -proc:only T6362067.java
    85.7 - * @compile/ref=T6362067.out -XDstdout -XDrawDiagnostics -processor T6362067 -proc:only T6362067.java
    85.8 + * @compile/ref=T6362067.out -XDrawDiagnostics -processor T6362067 -proc:only T6362067.java
    85.9   */
   85.10  
   85.11  import java.util.Set;

    86.1 --- a/test/tools/javac/processing/warnings/TestSourceVersionWarnings.java	Thu Jul 22 11:02:54 2010 -0700
    86.2 +++ b/test/tools/javac/processing/warnings/TestSourceVersionWarnings.java	Mon Jul 26 14:18:45 2010 -0700
    86.3 @@ -27,15 +27,15 @@
    86.4   * @summary Test that warnings about source versions are output as expected.
    86.5   * @author  Joseph D. Darcy
    86.6   * @compile TestSourceVersionWarnings.java
    86.7 - * @compile/ref=gold_0.out             -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only                           -source 1.5 HelloWorld.java
    86.8 - * @compile/ref=gold_sv_warn_0_2.out   -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_0 -source 1.2 HelloWorld.java
    86.9 - * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_2 -source 1.2 HelloWorld.java
   86.10 - * @compile/ref=gold_sv_warn_2_3.out   -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_2 -source 1.3 HelloWorld.java
   86.11 - * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_5 -source 1.5 HelloWorld.java
   86.12 - * @compile/ref=gold_sv_warn_5_6.out   -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_5 -source 1.6 HelloWorld.java
   86.13 - * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_6 -source 1.6 HelloWorld.java
   86.14 - * @compile/ref=gold_unsp_warn.out     -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_6 -source 1.6 -Aunsupported HelloWorld.java
   86.15 - * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_7 -source 1.7 HelloWorld.java
   86.16 + * @compile/ref=gold_0.out             -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only                           -source 1.5 HelloWorld.java
   86.17 + * @compile/ref=gold_sv_warn_0_2.out   -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_0 -source 1.2 HelloWorld.java
   86.18 + * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_2 -source 1.2 HelloWorld.java
   86.19 + * @compile/ref=gold_sv_warn_2_3.out   -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_2 -source 1.3 HelloWorld.java
   86.20 + * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_5 -source 1.5 HelloWorld.java
   86.21 + * @compile/ref=gold_sv_warn_5_6.out   -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_5 -source 1.6 HelloWorld.java
   86.22 + * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_6 -source 1.6 HelloWorld.java
   86.23 + * @compile/ref=gold_unsp_warn.out     -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_6 -source 1.6 -Aunsupported HelloWorld.java
   86.24 + * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_7 -source 1.7 HelloWorld.java
   86.25   */
   86.26  
   86.27  import java.util.Set;

    87.1 --- a/test/tools/javac/protectedAccess/ProtectedMemberAccess2.java	Thu Jul 22 11:02:54 2010 -0700
    87.2 +++ b/test/tools/javac/protectedAccess/ProtectedMemberAccess2.java	Mon Jul 26 14:18:45 2010 -0700
    87.3 @@ -4,7 +4,7 @@
    87.4   * @summary Verify correct implementation of JLS2e 6.6.2.1
    87.5   * @author maddox
    87.6   *
    87.7 - * @compile/fail/ref=ProtectedMemberAccess2.out -XDstdout -XDdiags=-simpleNames -XDdiagsFormat=%b:%l:%_%m ProtectedMemberAccess2.java
    87.8 + * @compile/fail/ref=ProtectedMemberAccess2.out -XDdiags=-simpleNames -XDdiagsFormat=%b:%l:%_%m ProtectedMemberAccess2.java
    87.9   */
   87.10  
   87.11  // 71 errors expected.

    88.1 --- a/test/tools/javac/protectedAccess/ProtectedMemberAccess3.java	Thu Jul 22 11:02:54 2010 -0700
    88.2 +++ b/test/tools/javac/protectedAccess/ProtectedMemberAccess3.java	Mon Jul 26 14:18:45 2010 -0700
    88.3 @@ -4,7 +4,7 @@
    88.4   * @summary Verify correct implementation of JLS2e 6.6.2.1
    88.5   * @author maddox
    88.6   *
    88.7 - * @compile/fail/ref=ProtectedMemberAccess3.out -XDstdout -XDdiags=-simpleNames -XDdiagsFormat=%b:%l:%_%m ProtectedMemberAccess3.java
    88.8 + * @compile/fail/ref=ProtectedMemberAccess3.out -XDdiags=-simpleNames -XDdiagsFormat=%b:%l:%_%m ProtectedMemberAccess3.java
    88.9   */
   88.10  
   88.11  // 46 errors expected.

    89.1 --- a/test/tools/javac/protectedAccess/ProtectedMemberAccess4.java	Thu Jul 22 11:02:54 2010 -0700
    89.2 +++ b/test/tools/javac/protectedAccess/ProtectedMemberAccess4.java	Mon Jul 26 14:18:45 2010 -0700
    89.3 @@ -4,7 +4,7 @@
    89.4   * @summary Verify correct implementation of JLS2e 6.6.2.1
    89.5   * @author maddox
    89.6   *
    89.7 - * @compile/fail/ref=ProtectedMemberAccess4.out -XDstdout -XDdiags=-simpleNames -XDdiagsFormat=%b:%l:%_%m ProtectedMemberAccess4.java
    89.8 + * @compile/fail/ref=ProtectedMemberAccess4.out -XDdiags=-simpleNames -XDdiagsFormat=%b:%l:%_%m ProtectedMemberAccess4.java
    89.9   */
   89.10  
   89.11  // 33 errors expected.

    90.1 --- a/test/tools/javac/rawDiags/Error.java	Thu Jul 22 11:02:54 2010 -0700
    90.2 +++ b/test/tools/javac/rawDiags/Error.java	Mon Jul 26 14:18:45 2010 -0700
    90.3 @@ -2,7 +2,7 @@
    90.4   * @test  /nodynamiccopyright/
    90.5   * @bug 6177732
    90.6   * @summary add hidden option to have compiler generate diagnostics in more machine-readable form
    90.7 - * @compile/fail/ref=Error.out -XDrawDiagnostics -XDstdout Error.java
    90.8 + * @compile/fail/ref=Error.out -XDrawDiagnostics Error.java
    90.9   */
   90.10  class Error
   90.11  {

    91.1 --- a/test/tools/javac/rawDiags/Note.java	Thu Jul 22 11:02:54 2010 -0700
    91.2 +++ b/test/tools/javac/rawDiags/Note.java	Mon Jul 26 14:18:45 2010 -0700
    91.3 @@ -25,7 +25,7 @@
    91.4   * @test
    91.5   * @bug 6177732
    91.6   * @summary add hidden option to have compiler generate diagnostics in more machine-readable form
    91.7 - * @compile/ref=Note.out -XDrawDiagnostics -XDstdout Note.java
    91.8 + * @compile/ref=Note.out -XDrawDiagnostics Note.java
    91.9   */
   91.10  class Note
   91.11  {

    92.1 --- a/test/tools/javac/rawDiags/Warning.java	Thu Jul 22 11:02:54 2010 -0700
    92.2 +++ b/test/tools/javac/rawDiags/Warning.java	Mon Jul 26 14:18:45 2010 -0700
    92.3 @@ -2,7 +2,7 @@
    92.4   * @test  /nodynamiccopyright/
    92.5   * @bug 6177732
    92.6   * @summary add hidden option to have compiler generate diagnostics in more machine-readable form
    92.7 - * @compile/ref=Warning.out -XDrawDiagnostics -XDstdout -Xlint:unchecked Warning.java
    92.8 + * @compile/ref=Warning.out -XDrawDiagnostics -Xlint:unchecked Warning.java
    92.9   */
   92.10  
   92.11  import java.util.HashSet;

    93.1 --- a/test/tools/javac/unicode/UnicodeNewline.java	Thu Jul 22 11:02:54 2010 -0700
    93.2 +++ b/test/tools/javac/unicode/UnicodeNewline.java	Mon Jul 26 14:18:45 2010 -0700
    93.3 @@ -3,7 +3,7 @@
    93.4   * @bug 4739428 4785453
    93.5   * @summary when \u000a is used, diagnostics are reported on the wrong line.
    93.6   *
    93.7 - * @compile/fail/ref=UnicodeNewline.out -XDstdout -XDdiags=%b:%l:%_%m UnicodeNewline.java
    93.8 + * @compile/fail/ref=UnicodeNewline.out -XDdiags=%b:%l:%_%m UnicodeNewline.java
    93.9   */
   93.10  
   93.11  class UnicodeNewline {

    94.1 --- a/test/tools/javac/warnings/Deprecation.java	Thu Jul 22 11:02:54 2010 -0700
    94.2 +++ b/test/tools/javac/warnings/Deprecation.java	Mon Jul 26 14:18:45 2010 -0700
    94.3 @@ -1,9 +1,9 @@
    94.4  /**
    94.5   * @test  /nodynamiccopyright/
    94.6   * @bug 4986256
    94.7 - * @compile/ref=Deprecation.noLint.out -XDstdout                             -XDrawDiagnostics Deprecation.java
    94.8 - * @compile/ref=Deprecation.lintDeprecation.out -XDstdout -Xlint:deprecation -XDrawDiagnostics Deprecation.java
    94.9 - * @compile/ref=Deprecation.lintAll.out -XDstdout         -Xlint:all,-path   -XDrawDiagnostics Deprecation.java
   94.10 + * @compile/ref=Deprecation.noLint.out                             -XDrawDiagnostics Deprecation.java
   94.11 + * @compile/ref=Deprecation.lintDeprecation.out -Xlint:deprecation -XDrawDiagnostics Deprecation.java
   94.12 + * @compile/ref=Deprecation.lintAll.out         -Xlint:all,-path   -XDrawDiagnostics Deprecation.java
   94.13   */
   94.14  
   94.15  @Deprecated

    95.1 --- a/test/tools/javac/warnings/DivZero.java	Thu Jul 22 11:02:54 2010 -0700
    95.2 +++ b/test/tools/javac/warnings/DivZero.java	Mon Jul 26 14:18:45 2010 -0700
    95.3 @@ -1,9 +1,9 @@
    95.4  /**
    95.5   * @test  /nodynamiccopyright/
    95.6   * @bug 4759494 4986256
    95.7 - * @compile/ref=DivZero.noLint.out -XDstdout                   -XDrawDiagnostics DivZero.java
    95.8 - * @compile/ref=DivZero.lint.out -XDstdout    -Xlint:divzero   -XDrawDiagnostics DivZero.java
    95.9 - * @compile/ref=DivZero.lint.out -XDstdout    -Xlint:all,-path -XDrawDiagnostics DivZero.java
   95.10 + * @compile/ref=DivZero.noLint.out                   -XDrawDiagnostics DivZero.java
   95.11 + * @compile/ref=DivZero.lint.out    -Xlint:divzero   -XDrawDiagnostics DivZero.java
   95.12 + * @compile/ref=DivZero.lint.out    -Xlint:all,-path -XDrawDiagnostics DivZero.java
   95.13   */
   95.14  
   95.15  class DivZero

    96.1 --- a/test/tools/javac/warnings/FallThrough.java	Thu Jul 22 11:02:54 2010 -0700
    96.2 +++ b/test/tools/javac/warnings/FallThrough.java	Mon Jul 26 14:18:45 2010 -0700
    96.3 @@ -1,9 +1,9 @@
    96.4  /**
    96.5   * @test  /nodynamiccopyright/
    96.6   * @bug 4986256
    96.7 - * @compile/ref=FallThrough.noLint.out -XDstdout                             -XDrawDiagnostics FallThrough.java
    96.8 - * @compile/ref=FallThrough.lintAll.out -XDstdout         -Xlint:all,-path   -XDrawDiagnostics FallThrough.java
    96.9 - * @compile/ref=FallThrough.lintFallThrough.out -XDstdout -Xlint:fallthrough -XDrawDiagnostics FallThrough.java
   96.10 + * @compile/ref=FallThrough.noLint.out                             -XDrawDiagnostics FallThrough.java
   96.11 + * @compile/ref=FallThrough.lintAll.out         -Xlint:all,-path   -XDrawDiagnostics FallThrough.java
   96.12 + * @compile/ref=FallThrough.lintFallThrough.out -Xlint:fallthrough -XDrawDiagnostics FallThrough.java
   96.13   */
   96.14  
   96.15  // control: this class should generate a warning

    97.1 --- a/test/tools/javac/warnings/Unchecked.java	Thu Jul 22 11:02:54 2010 -0700
    97.2 +++ b/test/tools/javac/warnings/Unchecked.java	Mon Jul 26 14:18:45 2010 -0700
    97.3 @@ -1,9 +1,9 @@
    97.4  /**
    97.5   * @test  /nodynamiccopyright/
    97.6   * @bug 4986256
    97.7 - * @compile/ref=Unchecked.noLint.out -XDstdout                         -XDrawDiagnostics Unchecked.java
    97.8 - * @compile/ref=Unchecked.lintUnchecked.out -XDstdout -Xlint:unchecked -XDrawDiagnostics Unchecked.java
    97.9 - * @compile/ref=Unchecked.lintAll.out -XDstdout       -Xlint:all,-path -XDrawDiagnostics Unchecked.java
   97.10 + * @compile/ref=Unchecked.noLint.out                         -XDrawDiagnostics Unchecked.java
   97.11 + * @compile/ref=Unchecked.lintUnchecked.out -Xlint:unchecked -XDrawDiagnostics Unchecked.java
   97.12 + * @compile/ref=Unchecked.lintAll.out       -Xlint:all,-path -XDrawDiagnostics Unchecked.java
   97.13   */
   97.14  
   97.15  import java.util.ArrayList;