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

--- a/langtools/test/tools/javac/4980495/std/Test.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/4980495/std/Test.java	Mon Jul 26 14:18:45 2010 -0700
@@ -1,7 +1,7 @@
 /*
  * @test  /nodynamiccopyright/
  * @bug 4980495 6260444
- * @compile/fail/ref=Test.out -XDstdout -XDrawDiagnostics Test.java p1/A1.java p2/A2.java
+ * @compile/fail/ref=Test.out -XDrawDiagnostics Test.java p1/A1.java p2/A2.java
  *
  */
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

--- a/langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_1.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_1.java	Mon Jul 26 14:18:45 2010 -0700
@@ -7,7 +7,7 @@
  *
  * @compile pack1/P1.java
  * @compile pack1/P2.java
- * @compile/fail/ref=QualifiedAccess_1.out -XDrawDiagnostics -XDstdout QualifiedAccess_1.java
+ * @compile/fail/ref=QualifiedAccess_1.out -XDrawDiagnostics QualifiedAccess_1.java
  */
 
 import pack1.P1;

--- a/langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_2.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_2.java	Mon Jul 26 14:18:45 2010 -0700
@@ -7,7 +7,7 @@
  *
  * @compile pack1/P1.java
  * @compile pack1/P2.java
- * @compile/fail/ref=QualifiedAccess_2.out -XDrawDiagnostics -XDstdout QualifiedAccess_2.java
+ * @compile/fail/ref=QualifiedAccess_2.out -XDrawDiagnostics QualifiedAccess_2.java
  */
 
 import pack1.P1;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

--- a/langtools/test/tools/javac/T6245591.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/T6245591.java	Mon Jul 26 14:18:45 2010 -0700
@@ -1,7 +1,7 @@
 /*
  * @test  /nodynamiccopyright/
  * @bug 6245591
- * @compile/ref=T6245591.out -XDstdout -XDrawDiagnostics -Xlint:all,-path T6245591.java
+ * @compile/ref=T6245591.out -XDrawDiagnostics -Xlint:all,-path T6245591.java
  */
 enum Season {
     /** @deprecated */

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

--- a/langtools/test/tools/javac/T6394563.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/T6394563.java	Mon Jul 26 14:18:45 2010 -0700
@@ -3,13 +3,13 @@
  * @bug 6394563
  * @summary javac ignores -nowarn switch in 1.5.0_06 for deprecation warnings
  *
- * @compile/ref=T6394563.note.out  -XDstdout -XDrawDiagnostics -nowarn             T6394563.java
- * @compile/ref=T6394563.note.out  -XDstdout -XDrawDiagnostics -nowarn -source 1.5 T6394563.java
- * @compile/ref=T6394563.empty.out -XDstdout -XDrawDiagnostics -nowarn -source 1.4 T6394563.java
+ * @compile/ref=T6394563.note.out  -XDrawDiagnostics -nowarn             T6394563.java
+ * @compile/ref=T6394563.note.out  -XDrawDiagnostics -nowarn -source 1.5 T6394563.java
+ * @compile/ref=T6394563.empty.out -XDrawDiagnostics -nowarn -source 1.4 T6394563.java
  *
- * @compile/ref=T6394563.warn.out  -XDstdout -XDrawDiagnostics -Xlint -nowarn             T6394563.java
- * @compile/ref=T6394563.warn.out  -XDstdout -XDrawDiagnostics -Xlint -nowarn -source 1.5 T6394563.java
- * @compile/ref=T6394563.empty.out -XDstdout -XDrawDiagnostics -Xlint -nowarn -source 1.4 T6394563.java
+ * @compile/ref=T6394563.warn.out  -XDrawDiagnostics -Xlint -nowarn             T6394563.java
+ * @compile/ref=T6394563.warn.out  -XDrawDiagnostics -Xlint -nowarn -source 1.5 T6394563.java
+ * @compile/ref=T6394563.empty.out -XDrawDiagnostics -Xlint -nowarn -source 1.4 T6394563.java
  */
 
 class T6394563 {

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

--- a/langtools/test/tools/javac/annotations/6365854/T6365854.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/annotations/6365854/T6365854.java	Mon Jul 26 14:18:45 2010 -0700
@@ -33,11 +33,11 @@
  *
  * @compile TestAnnotation.java TestCore.java
  * @clean test.annotation.TestAnnotation
- * @compile/ref=test1.out -XDstdout -XDrawDiagnostics T6365854.java
+ * @compile/ref=test1.out -XDrawDiagnostics T6365854.java
  * @run main T6365854
- * @compile/ref=test2.out -XDstdout -XDrawDiagnostics evolve/TestAnnotation.java T6365854.java
+ * @compile/ref=test2.out -XDrawDiagnostics evolve/TestAnnotation.java T6365854.java
  * @run main T6365854
- * @compile/ref=test2.out -XDstdout -XDrawDiagnostics T6365854.java
+ * @compile/ref=test2.out -XDrawDiagnostics T6365854.java
  * @run main T6365854
  */
 

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

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

--- a/langtools/test/tools/javac/danglingDep/Test1.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/danglingDep/Test1.java	Mon Jul 26 14:18:45 2010 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 6213430
  * @clean Test1 X RefX
- * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics Test1.java RefX.java
+ * @compile/ref=Test1.out -XDrawDiagnostics Test1.java RefX.java
  */
 class Test1
 {

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

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

--- a/langtools/test/tools/javac/depOverrides/annotation/Test1.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/depOverrides/annotation/Test1.java	Mon Jul 26 14:18:45 2010 -0700
@@ -26,12 +26,12 @@
  * @bug 5086088
  * @summary check warnings generated when overriding deprecated methods
  *
- * @compile/ref=empty       -XDstdout -XDrawDiagnostics -Xlint:deprecation I.java
- * @compile/ref=Test1A.out  -XDstdout -XDrawDiagnostics -Xlint:deprecation A.java
- * @compile/ref=Test1B.out  -XDstdout -XDrawDiagnostics -Xlint:deprecation B.java
- * @compile/ref=Test1B2.out -XDstdout -XDrawDiagnostics -Xlint:deprecation B2.java
- * @compile/ref=empty       -XDstdout -XDrawDiagnostics -Xlint:deprecation B3.java
- * @compile/ref=empty       -XDstdout -XDrawDiagnostics -Xlint:deprecation Test1.java
+ * @compile/ref=empty       -XDrawDiagnostics -Xlint:deprecation I.java
+ * @compile/ref=Test1A.out  -XDrawDiagnostics -Xlint:deprecation A.java
+ * @compile/ref=Test1B.out  -XDrawDiagnostics -Xlint:deprecation B.java
+ * @compile/ref=Test1B2.out -XDrawDiagnostics -Xlint:deprecation B2.java
+ * @compile/ref=empty       -XDrawDiagnostics -Xlint:deprecation B3.java
+ * @compile/ref=empty       -XDrawDiagnostics -Xlint:deprecation Test1.java
  */
 
 

--- a/langtools/test/tools/javac/depOverrides/annotation/Test2.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/depOverrides/annotation/Test2.java	Mon Jul 26 14:18:45 2010 -0700
@@ -26,10 +26,10 @@
  * @bug 5086088
  * @summary check warnings generated when overriding deprecated methods
  *
- * @compile/ref=empty   -XDstdout -XDrawDiagnostics -Xlint:deprecation P.java
- * @compile/ref=Test2Q.out -XDstdout -XDrawDiagnostics -Xlint:deprecation Q.java
- * @compile/ref=Test2R.out -XDstdout -XDrawDiagnostics -Xlint:deprecation R.java
- * @compile/ref=empty   -XDstdout -XDrawDiagnostics -Xlint:deprecation Test2.java
+ * @compile/ref=empty   -XDrawDiagnostics -Xlint:deprecation P.java
+ * @compile/ref=Test2Q.out -XDrawDiagnostics -Xlint:deprecation Q.java
+ * @compile/ref=Test2R.out -XDrawDiagnostics -Xlint:deprecation R.java
+ * @compile/ref=empty   -XDrawDiagnostics -Xlint:deprecation Test2.java
  */
 
 

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

--- a/langtools/test/tools/javac/depOverrides/doccomment/Test1.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test1.java	Mon Jul 26 14:18:45 2010 -0700
@@ -26,12 +26,12 @@
  * @bug 5086088
  * @summary check warnings generated when overriding deprecated methods
  *
- * @compile/ref=empty    -XDstdout -XDrawDiagnostics -Xlint:deprecation I.java
- * @compile/ref=Test1A.out  -XDstdout -XDrawDiagnostics -Xlint:deprecation A.java
- * @compile/ref=Test1B.out  -XDstdout -XDrawDiagnostics -Xlint:deprecation B.java
- * @compile/ref=Test1B2.out -XDstdout -XDrawDiagnostics -Xlint:deprecation B2.java
- * @compile/ref=empty    -XDstdout -XDrawDiagnostics -Xlint:deprecation B3.java
- * @compile/ref=empty    -XDstdout -XDrawDiagnostics -Xlint:deprecation Test1.java
+ * @compile/ref=empty    -XDrawDiagnostics -Xlint:deprecation I.java
+ * @compile/ref=Test1A.out  -XDrawDiagnostics -Xlint:deprecation A.java
+ * @compile/ref=Test1B.out  -XDrawDiagnostics -Xlint:deprecation B.java
+ * @compile/ref=Test1B2.out -XDrawDiagnostics -Xlint:deprecation B2.java
+ * @compile/ref=empty    -XDrawDiagnostics -Xlint:deprecation B3.java
+ * @compile/ref=empty    -XDrawDiagnostics -Xlint:deprecation Test1.java
  */
 
 

--- a/langtools/test/tools/javac/depOverrides/doccomment/Test2.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test2.java	Mon Jul 26 14:18:45 2010 -0700
@@ -26,10 +26,10 @@
  * @bug 5086088
  * @summary check warnings generated when overriding deprecated methods
  *
- * @compile/ref=empty   -XDstdout -XDrawDiagnostics -Xlint:deprecation P.java
- * @compile/ref=Test2Q.out -XDstdout -XDrawDiagnostics -Xlint:deprecation Q.java
- * @compile/ref=Test2R.out -XDstdout -XDrawDiagnostics -Xlint:deprecation R.java
- * @compile/ref=empty   -XDstdout -XDrawDiagnostics -Xlint:deprecation Test2.java
+ * @compile/ref=empty   -XDrawDiagnostics -Xlint:deprecation P.java
+ * @compile/ref=Test2Q.out -XDrawDiagnostics -Xlint:deprecation Q.java
+ * @compile/ref=Test2R.out -XDrawDiagnostics -Xlint:deprecation R.java
+ * @compile/ref=empty   -XDrawDiagnostics -Xlint:deprecation Test2.java
  */
 
 

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

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

--- a/langtools/test/tools/javac/enum/6384542/T6384542a.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/enum/6384542/T6384542a.java	Mon Jul 26 14:18:45 2010 -0700
@@ -5,8 +5,8 @@
  * @author  Peter von der Ah\u00e9
  * @compile/fail -source 5   T6384542a.java
  * @compile      -source 1.4 T6384542a.java
- * @compile/fail/ref=T6384542a_5.out -source 5   -XDstdout -XDrawDiagnostics T6384542a.java
- * @compile/ref=T6384542a_1_4.out    -source 1.4 -XDstdout -XDrawDiagnostics T6384542a.java
+ * @compile/fail/ref=T6384542a_5.out -source 5   -XDrawDiagnostics T6384542a.java
+ * @compile/ref=T6384542a_1_4.out    -source 1.4 -XDrawDiagnostics T6384542a.java
  */
 
 public class T6384542a {

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

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

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

--- a/langtools/test/tools/javac/generics/6359951/T6359951.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/generics/6359951/T6359951.java	Mon Jul 26 14:18:45 2010 -0700
@@ -4,7 +4,7 @@
  * @summary Crash when using class field
  *
  *
- * @compile/fail/ref=T6359951.out -XDstdout -XDrawDiagnostics T6359951.java
+ * @compile/fail/ref=T6359951.out -XDrawDiagnostics T6359951.java
  */
 
 public class T6359951 {

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

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

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

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

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

--- a/langtools/test/tools/javac/lint/NoWarn.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/lint/NoWarn.java	Mon Jul 26 14:18:45 2010 -0700
@@ -2,9 +2,9 @@
  * @test  /nodynamiccopyright/
  * @bug 6183484
  * @summary verify -nowarn is the same as -Xlint:none
- * @compile/ref=NoWarn1.out -XDstdout -XDrawDiagnostics             NoWarn.java
- * @compile/ref=NoWarn2.out -XDstdout -XDrawDiagnostics -nowarn     NoWarn.java
- * @compile/ref=NoWarn2.out -XDstdout -XDrawDiagnostics -Xlint:none NoWarn.java
+ * @compile/ref=NoWarn1.out -XDrawDiagnostics             NoWarn.java
+ * @compile/ref=NoWarn2.out -XDrawDiagnostics -nowarn     NoWarn.java
+ * @compile/ref=NoWarn2.out -XDrawDiagnostics -Xlint:none NoWarn.java
  */
 
 class NoWarn {

--- a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test.java	Mon Jul 26 14:18:45 2010 -0700
@@ -28,110 +28,110 @@
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics A.java
+ * @compile/ref=Test1.out -XDrawDiagnostics A.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics -nowarn A.java
+ * @compile/ref=Test1.out -XDrawDiagnostics -nowarn A.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics -Xmaxwarns 1 A.java
+ * @compile/ref=Test1.out -XDrawDiagnostics -Xmaxwarns 1 A.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test2.out -XDstdout -XDrawDiagnostics A.java B.java
+ * @compile/ref=Test2.out -XDrawDiagnostics A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test2.out -XDstdout -XDrawDiagnostics -nowarn A.java B.java
+ * @compile/ref=Test2.out -XDrawDiagnostics -nowarn A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test2.out -XDstdout -XDrawDiagnostics -Xmaxwarns 1 A.java B.java
+ * @compile/ref=Test2.out -XDrawDiagnostics -Xmaxwarns 1 A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test3.out -XDstdout -XDrawDiagnostics -Xlint:deprecation A.java
+ * @compile/ref=Test3.out -XDrawDiagnostics -Xlint:deprecation A.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test3.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:deprecation A.java
+ * @compile/ref=Test3.out -XDrawDiagnostics -nowarn -Xlint:deprecation A.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test3b.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 1 A.java
+ * @compile/ref=Test3b.out -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 1 A.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test4.out -XDstdout -XDrawDiagnostics -Xlint:deprecation A.java B.java
+ * @compile/ref=Test4.out -XDrawDiagnostics -Xlint:deprecation A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test4.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:deprecation A.java B.java
+ * @compile/ref=Test4.out -XDrawDiagnostics -nowarn -Xlint:deprecation A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test4b.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 1 A.java B.java
+ * @compile/ref=Test4b.out -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 1 A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test4c.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 2 A.java B.java
+ * @compile/ref=Test4c.out -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 2 A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test4d.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 3 A.java B.java
+ * @compile/ref=Test4d.out -XDrawDiagnostics -nowarn -Xlint:deprecation -Xmaxwarns 3 A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test5.out -XDstdout -XDrawDiagnostics -Xlint:deprecation  P.java Q.java
+ * @compile/ref=Test5.out -XDrawDiagnostics -Xlint:deprecation  P.java Q.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test5b.out -XDstdout -XDrawDiagnostics -Xlint:deprecation -Xmaxwarns 2 P.java Q.java
+ * @compile/ref=Test5b.out -XDrawDiagnostics -Xlint:deprecation -Xmaxwarns 2 P.java Q.java
  */

--- a/langtools/test/tools/javac/mandatoryWarnings/unchecked/Test.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/mandatoryWarnings/unchecked/Test.java	Mon Jul 26 14:18:45 2010 -0700
@@ -28,96 +28,96 @@
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics A.java
+ * @compile/ref=Test1.out -XDrawDiagnostics A.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics -nowarn A.java
+ * @compile/ref=Test1.out -XDrawDiagnostics -nowarn A.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test1.out -XDstdout -XDrawDiagnostics -Xmaxwarns 1 A.java
+ * @compile/ref=Test1.out -XDrawDiagnostics -Xmaxwarns 1 A.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test2.out -XDstdout -XDrawDiagnostics A.java B.java
+ * @compile/ref=Test2.out -XDrawDiagnostics A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test2.out -XDstdout -XDrawDiagnostics -nowarn A.java B.java
+ * @compile/ref=Test2.out -XDrawDiagnostics -nowarn A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test2.out -XDstdout -XDrawDiagnostics -Xmaxwarns 1 A.java B.java
+ * @compile/ref=Test2.out -XDrawDiagnostics -Xmaxwarns 1 A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test3.out -XDstdout -XDrawDiagnostics -Xlint:unchecked A.java
+ * @compile/ref=Test3.out -XDrawDiagnostics -Xlint:unchecked A.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test3.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:unchecked A.java
+ * @compile/ref=Test3.out -XDrawDiagnostics -nowarn -Xlint:unchecked A.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test3b.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 1 A.java
+ * @compile/ref=Test3b.out -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 1 A.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test4.out -XDstdout -XDrawDiagnostics -Xlint:unchecked A.java B.java
+ * @compile/ref=Test4.out -XDrawDiagnostics -Xlint:unchecked A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test4.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:unchecked A.java B.java
+ * @compile/ref=Test4.out -XDrawDiagnostics -nowarn -Xlint:unchecked A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test4b.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 1 A.java B.java
+ * @compile/ref=Test4b.out -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 1 A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test4c.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 2 A.java B.java
+ * @compile/ref=Test4c.out -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 2 A.java B.java
  */
 
 /*
  * @test
  * @bug 5047307
  * @summary javac -nowarn improperly suppresses JLS-mandated warnings
- * @compile/ref=Test4d.out -XDstdout -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 3 A.java B.java
+ * @compile/ref=Test4d.out -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 3 A.java B.java
  */

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

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

--- a/langtools/test/tools/javac/policy/test1/Test1a.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/policy/test1/Test1a.java	Mon Jul 26 14:18:45 2010 -0700
@@ -35,7 +35,7 @@
  * @summary provide variable policies for javac operation
  *              Default compile policy is now "by file" (reverted to "todo" for 6382700)
  *              Because of attr errors in B, no code should be generated
- * @compile/fail/ref=bytodo.ABD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy A.java B.java D.java
+ * @compile/fail/ref=bytodo.ABD.out -XDrawDiagnostics -XDverboseCompilePolicy A.java B.java D.java
  */
 
 /*
@@ -43,7 +43,7 @@
  * @bug 6260188
  * @summary provide variable policies for javac operation
  *              Generate code for A, A1, A2, B
- * @compile/fail/ref=bytodo.ABD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=bytodo A.java B.java D.java
+ * @compile/fail/ref=bytodo.ABD.out -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=bytodo A.java B.java D.java
  */
 
 /*
@@ -51,7 +51,7 @@
  * @bug 6260188
  * @summary provide variable policies for javac operation
  *              Because of attr errors in B, no code should be generated
- * @compile/fail/ref=simple.ABD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=simple A.java B.java D.java
+ * @compile/fail/ref=simple.ABD.out -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=simple A.java B.java D.java
  */
 
 /*
@@ -59,7 +59,7 @@
  * @bug 6260188
  * @summary provide variable policies for javac operation
  *              Because of attr errors in B, no code should be generated
- * @compile/fail/ref=byfile.ABD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=byfile A.java B.java D.java
+ * @compile/fail/ref=byfile.ABD.out -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=byfile A.java B.java D.java
  */
 
 
@@ -71,7 +71,7 @@
  * @summary provide variable policies for javac operation
  *              Default compile policy is now "by file" (reverted to "todo" for 6382700)
  *              Generate code for A, A1, A2, but because of flow errors in C, no more code should be generated
- * @compile/fail/ref=bytodo.ACD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy A.java C.java D.java
+ * @compile/fail/ref=bytodo.ACD.out -XDrawDiagnostics -XDverboseCompilePolicy A.java C.java D.java
  */
 
 /*
@@ -79,7 +79,7 @@
  * @bug 6260188
  * @summary provide variable policies for javac operation
  *              Generate code for A, A1, A2, C
- * @compile/fail/ref=bytodo.ACD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=bytodo A.java C.java D.java
+ * @compile/fail/ref=bytodo.ACD.out -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=bytodo A.java C.java D.java
  */
 
 /*
@@ -87,7 +87,7 @@
  * @bug 6260188
  * @summary provide variable policies for javac operation
  *              Because of flow errors in C, no code should be generated
- * @compile/fail/ref=simple.ACD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=simple A.java C.java D.java
+ * @compile/fail/ref=simple.ACD.out -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=simple A.java C.java D.java
  */
 
 /*
@@ -95,5 +95,5 @@
  * @bug 6260188
  * @summary provide variable policies for javac operation
  *              Generate code for A, A1, A2, but because of flow errors in C, no more code should be generated
- * @compile/fail/ref=byfile.ACD.out -XDstdout -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=byfile A.java C.java D.java
+ * @compile/fail/ref=byfile.ACD.out -XDrawDiagnostics -XDverboseCompilePolicy -XDcompilePolicy=byfile A.java C.java D.java
  */

--- a/langtools/test/tools/javac/policy/test2/Test.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/policy/test2/Test.java	Mon Jul 26 14:18:45 2010 -0700
@@ -23,20 +23,20 @@
 
 /*
  * @test
- * @compile/ref=byfile.AB.out -XDstdout -XDverboseCompilePolicy -XDcompile.policy=byfile A.java B.java
+ * @compile/ref=byfile.AB.out -XDverboseCompilePolicy -XDcompile.policy=byfile A.java B.java
  */
 
 /*
  * @test
- * @compile/ref=byfile.BA.out -XDstdout -XDverboseCompilePolicy -XDcompile.policy=byfile B.java A.java
+ * @compile/ref=byfile.BA.out -XDverboseCompilePolicy -XDcompile.policy=byfile B.java A.java
  */
 
 /*
  * @test
- * @compile/ref=bytodo.AB.out -XDstdout -XDverboseCompilePolicy -XDcompile.policy=bytodo A.java B.java
+ * @compile/ref=bytodo.AB.out -XDverboseCompilePolicy -XDcompile.policy=bytodo A.java B.java
  */
 
 /*
  * @test
- * @compile/ref=bytodo.BA.out -XDstdout -XDverboseCompilePolicy -XDcompile.policy=bytodo B.java A.java
+ * @compile/ref=bytodo.BA.out -XDverboseCompilePolicy -XDcompile.policy=bytodo B.java A.java
  */

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

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

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

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

--- a/langtools/test/tools/javac/processing/warnings/TestSourceVersionWarnings.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/processing/warnings/TestSourceVersionWarnings.java	Mon Jul 26 14:18:45 2010 -0700
@@ -27,15 +27,15 @@
  * @summary Test that warnings about source versions are output as expected.
  * @author  Joseph D. Darcy
  * @compile TestSourceVersionWarnings.java
- * @compile/ref=gold_0.out             -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only                           -source 1.5 HelloWorld.java
- * @compile/ref=gold_sv_warn_0_2.out   -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_0 -source 1.2 HelloWorld.java
- * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_2 -source 1.2 HelloWorld.java
- * @compile/ref=gold_sv_warn_2_3.out   -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_2 -source 1.3 HelloWorld.java
- * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_5 -source 1.5 HelloWorld.java
- * @compile/ref=gold_sv_warn_5_6.out   -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_5 -source 1.6 HelloWorld.java
- * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_6 -source 1.6 HelloWorld.java
- * @compile/ref=gold_unsp_warn.out     -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_6 -source 1.6 -Aunsupported HelloWorld.java
- * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -XDstdout -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_7 -source 1.7 HelloWorld.java
+ * @compile/ref=gold_0.out             -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only                           -source 1.5 HelloWorld.java
+ * @compile/ref=gold_sv_warn_0_2.out   -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_0 -source 1.2 HelloWorld.java
+ * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_2 -source 1.2 HelloWorld.java
+ * @compile/ref=gold_sv_warn_2_3.out   -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_2 -source 1.3 HelloWorld.java
+ * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_5 -source 1.5 HelloWorld.java
+ * @compile/ref=gold_sv_warn_5_6.out   -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_5 -source 1.6 HelloWorld.java
+ * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_6 -source 1.6 HelloWorld.java
+ * @compile/ref=gold_unsp_warn.out     -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_6 -source 1.6 -Aunsupported HelloWorld.java
+ * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_7 -source 1.7 HelloWorld.java
  */
 
 import java.util.Set;

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

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

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

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

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

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

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

--- a/langtools/test/tools/javac/warnings/Deprecation.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/warnings/Deprecation.java	Mon Jul 26 14:18:45 2010 -0700
@@ -1,9 +1,9 @@
 /**
  * @test  /nodynamiccopyright/
  * @bug 4986256
- * @compile/ref=Deprecation.noLint.out -XDstdout                             -XDrawDiagnostics Deprecation.java
- * @compile/ref=Deprecation.lintDeprecation.out -XDstdout -Xlint:deprecation -XDrawDiagnostics Deprecation.java
- * @compile/ref=Deprecation.lintAll.out -XDstdout         -Xlint:all,-path   -XDrawDiagnostics Deprecation.java
+ * @compile/ref=Deprecation.noLint.out                             -XDrawDiagnostics Deprecation.java
+ * @compile/ref=Deprecation.lintDeprecation.out -Xlint:deprecation -XDrawDiagnostics Deprecation.java
+ * @compile/ref=Deprecation.lintAll.out         -Xlint:all,-path   -XDrawDiagnostics Deprecation.java
  */
 
 @Deprecated

--- a/langtools/test/tools/javac/warnings/DivZero.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/warnings/DivZero.java	Mon Jul 26 14:18:45 2010 -0700
@@ -1,9 +1,9 @@
 /**
  * @test  /nodynamiccopyright/
  * @bug 4759494 4986256
- * @compile/ref=DivZero.noLint.out -XDstdout                   -XDrawDiagnostics DivZero.java
- * @compile/ref=DivZero.lint.out -XDstdout    -Xlint:divzero   -XDrawDiagnostics DivZero.java
- * @compile/ref=DivZero.lint.out -XDstdout    -Xlint:all,-path -XDrawDiagnostics DivZero.java
+ * @compile/ref=DivZero.noLint.out                   -XDrawDiagnostics DivZero.java
+ * @compile/ref=DivZero.lint.out    -Xlint:divzero   -XDrawDiagnostics DivZero.java
+ * @compile/ref=DivZero.lint.out    -Xlint:all,-path -XDrawDiagnostics DivZero.java
  */
 
 class DivZero

--- a/langtools/test/tools/javac/warnings/FallThrough.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/warnings/FallThrough.java	Mon Jul 26 14:18:45 2010 -0700
@@ -1,9 +1,9 @@
 /**
  * @test  /nodynamiccopyright/
  * @bug 4986256
- * @compile/ref=FallThrough.noLint.out -XDstdout                             -XDrawDiagnostics FallThrough.java
- * @compile/ref=FallThrough.lintAll.out -XDstdout         -Xlint:all,-path   -XDrawDiagnostics FallThrough.java
- * @compile/ref=FallThrough.lintFallThrough.out -XDstdout -Xlint:fallthrough -XDrawDiagnostics FallThrough.java
+ * @compile/ref=FallThrough.noLint.out                             -XDrawDiagnostics FallThrough.java
+ * @compile/ref=FallThrough.lintAll.out         -Xlint:all,-path   -XDrawDiagnostics FallThrough.java
+ * @compile/ref=FallThrough.lintFallThrough.out -Xlint:fallthrough -XDrawDiagnostics FallThrough.java
  */
 
 // control: this class should generate a warning

--- a/langtools/test/tools/javac/warnings/Unchecked.java	Thu Jul 22 11:02:54 2010 -0700
+++ b/langtools/test/tools/javac/warnings/Unchecked.java	Mon Jul 26 14:18:45 2010 -0700
@@ -1,9 +1,9 @@
 /**
  * @test  /nodynamiccopyright/
  * @bug 4986256
- * @compile/ref=Unchecked.noLint.out -XDstdout                         -XDrawDiagnostics Unchecked.java
- * @compile/ref=Unchecked.lintUnchecked.out -XDstdout -Xlint:unchecked -XDrawDiagnostics Unchecked.java
- * @compile/ref=Unchecked.lintAll.out -XDstdout       -Xlint:all,-path -XDrawDiagnostics Unchecked.java
+ * @compile/ref=Unchecked.noLint.out                         -XDrawDiagnostics Unchecked.java
+ * @compile/ref=Unchecked.lintUnchecked.out -Xlint:unchecked -XDrawDiagnostics Unchecked.java
+ * @compile/ref=Unchecked.lintAll.out       -Xlint:all,-path -XDrawDiagnostics Unchecked.java
  */
 
 import java.util.ArrayList;