Don't use -XDrawDiagnostics in jtreg tests when it is not necessary (…

…#6646)
typetools · Jun 3, 2024 · b188046 · b188046
1 parent c85eb69
commit b188046
Show file tree

Hide file tree

Showing 43 changed files with 71 additions and 71 deletions.
diff --git a/checker/jtreg/index/ValueStubDriver.java b/checker/jtreg/index/ValueStubDriver.java
@@ -2,8 +2,8 @@
  * @test
  * @summary Test problem with aliasing LengthOf -> NonNegative and NonNegative -> IntRangeFromNonNegative
  *
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.index.IndexChecker valuestub/Test.java -Astubs=valuestub/Test.astub
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.index.IndexChecker valuestub/UseTest.java
+ * @compile -processor org.checkerframework.checker.index.IndexChecker valuestub/Test.java -Astubs=valuestub/Test.astub
+ * @compile -processor org.checkerframework.checker.index.IndexChecker valuestub/UseTest.java
  */
 
 public class ValueStubDriver {}
diff --git a/checker/jtreg/issue469/Main.java b/checker/jtreg/issue469/Main.java
@@ -3,13 +3,13 @@
  * @summary Test that Issue 469 is fixed. Thanks to user pSub for the test case.
  * @library .
  *
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.regex.RegexChecker simplecrash/CrashyInterface.java simplecrash/LetItCrash.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.regex.RegexChecker simplecrash/LetItCrash.java simplecrash/CrashyInterface.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.regex.RegexChecker simplecrash/CrashyInterface.java simplecrash/LetItCrash.java simplecrash/SomeRandomClass.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.regex.RegexChecker simplecrash/LetItCrash.java simplecrash/CrashyInterface.java simplecrash/SomeRandomClass.java
+ * @compile -processor org.checkerframework.checker.regex.RegexChecker simplecrash/CrashyInterface.java simplecrash/LetItCrash.java
+ * @compile -processor org.checkerframework.checker.regex.RegexChecker simplecrash/LetItCrash.java simplecrash/CrashyInterface.java
+ * @compile -processor org.checkerframework.checker.regex.RegexChecker simplecrash/CrashyInterface.java simplecrash/LetItCrash.java simplecrash/SomeRandomClass.java
+ * @compile -processor org.checkerframework.checker.regex.RegexChecker simplecrash/LetItCrash.java simplecrash/CrashyInterface.java simplecrash/SomeRandomClass.java
  *
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker advancedcrash/CrashyInterface.java advancedcrash/LetItCrash.java advancedcrash/SomeInterface.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker advancedcrash/LetItCrash.java advancedcrash/CrashyInterface.java advancedcrash/SomeInterface.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker advancedcrash/LetItCrash.java advancedcrash/SomeInterface.java  advancedcrash/CrashyInterface.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker advancedcrash/CrashyInterface.java advancedcrash/LetItCrash.java advancedcrash/SomeInterface.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker advancedcrash/LetItCrash.java advancedcrash/CrashyInterface.java advancedcrash/SomeInterface.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker advancedcrash/LetItCrash.java advancedcrash/SomeInterface.java  advancedcrash/CrashyInterface.java
  */
 public class Main {}
diff --git a/checker/jtreg/nullness/AssignmentPerformanceTest.java b/checker/jtreg/nullness/AssignmentPerformanceTest.java
@@ -2,7 +2,7 @@
  * @test
  * @summary Test case for issue #536: https://github.com/typetools/checker-framework/issues/536
  *
- * @compile/timeout=60 -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Alint AssignmentPerformanceTest.java
+ * @compile/timeout=60 -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Alint AssignmentPerformanceTest.java
  */
 public class AssignmentPerformanceTest {
   private String s1;

diff --git a/checker/jtreg/nullness/DefaultNonPublicClass.java b/checker/jtreg/nullness/DefaultNonPublicClass.java
@@ -3,8 +3,8 @@
  * @summary Test that verifies defaults in a non-public class in the same
  * file.
  *
- * @compile -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Alint DefaultNonPublicClass.java
- * @compile -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Alint DefaultNonPublicClass.java
+ * @compile -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Alint DefaultNonPublicClass.java
+ * @compile -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Alint DefaultNonPublicClass.java
  */
 
 import org.checkerframework.checker.nullness.qual.NonNull;

diff --git a/checker/jtreg/nullness/Issue1438.java b/checker/jtreg/nullness/Issue1438.java
@@ -2,7 +2,7 @@
  * @test
  * @summary Test case for issue #1438: https://github.com/typetools/checker-framework/issues/1438
  *
- * @compile/fail/timeout=90 -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Alint Issue1438.java
+ * @compile/fail/timeout=90 -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Alint Issue1438.java
  */
 
 import java.util.HashMap;

diff --git a/checker/jtreg/nullness/Issue1809.java b/checker/jtreg/nullness/Issue1809.java
@@ -4,9 +4,9 @@
  *     https://github.com/typetools/checker-framework/issues/1809
  *     Also see framework/tests/all-systems/Issue1809.java
  *
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -AatfCacheSize=4 Issue1809.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -AatfDoNotCache Issue1809.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker Issue1809.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker -AatfCacheSize=4 Issue1809.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker -AatfDoNotCache Issue1809.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker Issue1809.java
  */
 
 import java.util.List;

diff --git a/checker/jtreg/nullness/Issue2853.java b/checker/jtreg/nullness/Issue2853.java
@@ -2,7 +2,7 @@
  * @test
  * @summary Test case for issue #2853: https://github.com/typetools/checker-framework/issues/2853
  *
- * @compile/timeout=30 -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker Issue2853.java
+ * @compile/timeout=30 -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker Issue2853.java
  */
 public class Issue2853 {
 

diff --git a/checker/jtreg/nullness/Issue347.java b/checker/jtreg/nullness/Issue347.java
@@ -2,7 +2,7 @@
  * @test
  * @summary Test for Issue 347: concurrent semantics has desired behavior
  *
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -Alint Issue347.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker -Alint Issue347.java
  * @compile/fail/ref=Issue347-con.out -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -Alint Issue347.java -AconcurrentSemantics
  */
 

diff --git a/checker/jtreg/nullness/Issue4948.java b/checker/jtreg/nullness/Issue4948.java
@@ -2,7 +2,7 @@
  * @test
  * @summary Test case for issue #4948: https://github.com/typetools/checker-framework/issues/4948
  *
- * @compile/timeout=30 -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Alint Issue4948.java
+ * @compile/timeout=30 -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Alint Issue4948.java
  */
 import java.util.stream.Stream;
 import org.checkerframework.checker.nullness.qual.Nullable;

diff --git a/checker/jtreg/nullness/annotationsOnExtends/Other.java b/checker/jtreg/nullness/annotationsOnExtends/Other.java
@@ -2,8 +2,8 @@
  * @test
  * @summary Test for bug when storing annotations on extends or implements in class declarations in elements.
  *
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker Test.java Test2.java Other.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker Other.java Test.java Test2.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker Test.java Test2.java Other.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker Other.java Test.java Test2.java
  */
 
 public class Other {

diff --git a/checker/jtreg/nullness/issue12/BinaryDefaultTest.java b/checker/jtreg/nullness/issue12/BinaryDefaultTest.java
@@ -3,7 +3,7 @@
  * @summary Test the defaulting mechanism for nullness in binary files.
  *
  * @ignore Temporarily, until safe defaults for unannotated libraries are the default
- * @compile -XDrawDiagnostics -Xlint:unchecked BinaryDefaultTestBinary.java
+ * @compile -Xlint:unchecked BinaryDefaultTestBinary.java
  * @compile/fail/ref=BinaryDefaultTest.out -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker BinaryDefaultTest.java
  */
 

diff --git a/checker/jtreg/nullness/issue12/BinaryDefaultTestWithStub.java b/checker/jtreg/nullness/issue12/BinaryDefaultTestWithStub.java
@@ -5,7 +5,7 @@
  * argument is expected.
  *
  * @ignore Temporarily, until safe defaults fon unannotated libraries are the default
- * @compile -XDrawDiagnostics -Xlint:unchecked BinaryDefaultTestBinary.java
+ * @compile -Xlint:unchecked BinaryDefaultTestBinary.java
  * @compile/fail/ref=BinaryDefaultTestWithStub.out -XDrawDiagnostics -Xlint:unchecked -Astubs=binary.astub -processor org.checkerframework.checker.nullness.NullnessChecker BinaryDefaultTest.java
  */
 

diff --git a/checker/jtreg/nullness/issue141/Driver.java b/checker/jtreg/nullness/issue141/Driver.java
@@ -2,11 +2,11 @@
  * @test
  * @summary Test for Issue 141
  *
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker Appendable.java Driver.java InputSupplier.java Readable.java CharStreams.java Files.java OutputStreamWriter.java Closeable.java InputStreamReader.java OutputSupplier.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker Files.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker Appendable.java Driver.java InputSupplier.java Readable.java CharStreams.java Files.java OutputStreamWriter.java Closeable.java InputStreamReader.java OutputSupplier.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker Files.java
  *
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.regex.RegexChecker Appendable.java Driver.java InputSupplier.java Readable.java CharStreams.java Files.java OutputStreamWriter.java Closeable.java InputStreamReader.java OutputSupplier.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.regex.RegexChecker Files.java
+ * @compile -processor org.checkerframework.checker.regex.RegexChecker Appendable.java Driver.java InputSupplier.java Readable.java CharStreams.java Files.java OutputStreamWriter.java Closeable.java InputStreamReader.java OutputSupplier.java
+ * @compile -processor org.checkerframework.checker.regex.RegexChecker Files.java
  *
  */
 public class Driver {}
diff --git a/checker/jtreg/nullness/issue1582/Main.java b/checker/jtreg/nullness/issue1582/Main.java
@@ -5,9 +5,9 @@
  * https://github.com/typetools/checker-framework/issues/1582
  *
  * @compile/fail/ref=Foo.out -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext foo/Foo.java
- * @compile -XDrawDiagnostics foo/Foo.java
+ * @compile foo/Foo.java
  * @compile/fail/ref=JavaExpressionParseError.out -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext mainrepropkg/JavaExpressionParseError.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext mainrepropkg/JavaExpressionParseError.java -AsuppressWarnings=flowexpr.parse.error.postcondition
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext mainrepropkg/JavaExpressionParseError.java -AsuppressWarnings=flowexpr.parse.error.postcondition
  *
  */
 

diff --git a/checker/jtreg/nullness/issue1958/SupplierDefs.java b/checker/jtreg/nullness/issue1958/SupplierDefs.java
@@ -2,7 +2,7 @@
  * @test
  * @summary Test annotations on type parameters in extends.
  *
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker SupplierDefs.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker SupplierDefs.java
  * @compile/fail/ref=NPE2Test.out -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker NPE2Test.java -Anomsgtext
  */
 

diff --git a/checker/jtreg/nullness/issue257/Module.java b/checker/jtreg/nullness/issue257/Module.java
@@ -2,11 +2,11 @@
  * @test
  * @summary Test for Issue 257
  *
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker Small.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker Small.java
  *
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker ClientBuilder.java Module.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker ClientBuilder.java Module.java
  *
- * @compile -XDrawDiagnostics ClientBuilder.java
+ * @compile ClientBuilder.java
  */
 public class Module {
   void buildClient() {

diff --git a/checker/jtreg/nullness/issue3700/TimeUnitRange.java b/checker/jtreg/nullness/issue3700/TimeUnitRange.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test case for Issue #3700 https://github.com/typetools/checker-framework/issues/3700
- * @compile -XDrawDiagnostics -Xlint:unchecked TimeUnitRange.java
+ * @compile -Xlint:unchecked TimeUnitRange.java
  * @compile/ref=Client.out -processor org.checkerframework.checker.nullness.NullnessChecker Client.java -Astubs=TimeUnitRange.astub -implicit:none -Anomsgtext
  */
 

diff --git a/checker/jtreg/nullness/issue380/Driver.java b/checker/jtreg/nullness/issue380/Driver.java
@@ -2,8 +2,8 @@
  * @test
  * @summary Test for Issue 141
  *
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker Decl.java DA.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker DB.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker Decl.java DA.java
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker DB.java
  *
  *
  */

diff --git a/checker/jtreg/nullness/issue767/Class1.java b/checker/jtreg/nullness/issue767/Class1.java
@@ -2,8 +2,8 @@
  * @test
  * @summary Test that compliation order doesn't effect typechecking (#767)
  *
- * @compile -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext Class1.java Class2.java
- * @compile -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext Class2.java Class1.java
+ * @compile -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext Class1.java Class2.java
+ * @compile -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext Class2.java Class1.java
  *
  */
 

diff --git a/checker/jtreg/nullness/issue824/Class2.java b/checker/jtreg/nullness/issue824/Class2.java
@@ -4,9 +4,9 @@
  * The defaults for type variable upper bounds with type Object changed since
  * the issue was filed.  So, this test case has been changed so that
  * annotations on type variable bounds in stub files is still tested.
- * @compile -XDrawDiagnostics -Xlint:unchecked ../issue824lib/Class1.java
+ * @compile -Xlint:unchecked ../issue824lib/Class1.java
  * @compile/fail/ref=Class2.out -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext Class2.java -Astubs=Class1.astub
- * @compile -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext Class2.java
+ * @compile -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext Class2.java
  */
 
 import org.checkerframework.checker.nullness.qual.Nullable;

diff --git a/checker/jtreg/nullness/issue824/Second.java b/checker/jtreg/nullness/issue824/Second.java
@@ -1,9 +1,9 @@
 /*
  * @test
  * @summary Test case for Issue 824 https://github.com/typetools/checker-framework/issues/824
- * @compile -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext NoStubFirst.java NoStubSecond.java
- * @compile -XDrawDiagnostics -Xlint:unchecked ../issue824lib/First.java
- * @compile -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext Second.java -Astubs=First.astub
+ * @compile -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext NoStubFirst.java NoStubSecond.java
+ * @compile -Xlint:unchecked ../issue824lib/First.java
+ * @compile -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext Second.java -Astubs=First.astub
  */
 
 import org.checkerframework.checker.nullness.qual.Nullable;

diff --git a/checker/jtreg/nullness/stub-warnings/StubWarnings.java b/checker/jtreg/nullness/stub-warnings/StubWarnings.java
@@ -2,8 +2,8 @@
  * @test
  * @summary Test warnings for redundant stub file specifications.
  *
- * @compile -XDrawDiagnostics -Xlint:unchecked Binary.java
+ * @compile -Xlint:unchecked Binary.java
  * @compile/fail/ref=StubWarnings.out -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext -Astubs=binary.astub -AstubWarnIfRedundantWithBytecode -AstubWarnIfOverwritesBytecode -Werror StubWarnings.java
- * @compile -XDrawDiagnostics -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext -Astubs=binary.astub StubWarnings.java
+ * @compile -Xlint:unchecked -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext -Astubs=binary.astub StubWarnings.java
  */
 public class StubWarnings {}
diff --git a/checker/jtreg/stubs/Issue1542Driver.java b/checker/jtreg/stubs/Issue1542Driver.java
@@ -2,8 +2,8 @@
  * @test
  * @summary Test case for Issue 1542 https://github.com/typetools/checker-framework/issues/1542
  *
- * @compile -XDrawDiagnostics issue1542/NeedsIntRange.java issue1542/Stub.java issue1542/ExampleAnno.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.common.value.ValueChecker issue1542/UsesIntRange.java -Astubs=issue1542/ -AstubWarnIfNotFound -Werror
+ * @compile issue1542/NeedsIntRange.java issue1542/Stub.java issue1542/ExampleAnno.java
+ * @compile -processor org.checkerframework.common.value.ValueChecker issue1542/UsesIntRange.java -Astubs=issue1542/ -AstubWarnIfNotFound -Werror
  */
 
 public class Issue1542Driver {}
diff --git a/checker/jtreg/stubs/annotatedFor/UseTest.java b/checker/jtreg/stubs/annotatedFor/UseTest.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test AnnotatedFor in stub files
- * @compile -XDrawDiagnostics -Xlint:unchecked ../annotatedForLib/Test.java
+ * @compile -Xlint:unchecked ../annotatedForLib/Test.java
  * @compile/fail/ref=WithStub.out -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext UseTest.java -Astubs=Test.astub -Werror
  * @compile/fail/ref=WithStub.out -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext UseTest.java -Astubs=Test.astub -Werror -AuseConservativeDefaultsForUncheckedCode=bytecode
  * @compile/fail/ref=WithoutStub.out -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -Anomsgtext UseTest.java -Werror

diff --git a/checker/jtreg/stubs/defaultqualinstub/Main.java b/checker/jtreg/stubs/defaultqualinstub/Main.java
@@ -2,7 +2,7 @@
  * @test
  * @summary Test that the DefaultQualifier in an astub works.
  * @library .
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -Astubs=defaults.astub pck/Defaults.java -Werror
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker -Astubs=defaults.astub pck/Defaults.java -Werror
  */
 
 public class Main {}
diff --git a/checker/jtreg/stubs/fakeoverrides/Use.java b/checker/jtreg/stubs/fakeoverrides/Use.java
@@ -6,8 +6,8 @@
  * @test
  * @summary Test case for multiple fake overrides applying to a callsite.
  *
- * @compile -XDrawDiagnostics DefineClasses.java
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.tainting.TaintingChecker -Astubs=DefineClasses.astub -AstubWarnIfNotFound -Werror Use.java
+ * @compile DefineClasses.java
+ * @compile -processor org.checkerframework.checker.tainting.TaintingChecker -Astubs=DefineClasses.astub -AstubWarnIfNotFound -Werror Use.java
  */
 // TODO: Issue error SuperClass and SubInterface have conflicting fake overrides
 // See https://github.com/typetools/checker-framework/issues/2724

diff --git a/checker/jtreg/stubs/general/Driver.java b/checker/jtreg/stubs/general/Driver.java
@@ -2,7 +2,7 @@
  * @test
  * @summary Test that java.lang annotations can be used.
  * @library .
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -Astubs=MyStub.astub Driver.java -Werror
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker -Astubs=MyStub.astub Driver.java -Werror
  */
 
 public class Driver {

diff --git a/checker/jtreg/stubs/general/Driver2.java b/checker/jtreg/stubs/general/Driver2.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test that a stub file can have no package, but have an annotation on the class.
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -Astubs=NoPackage.astub Driver2.java -Werror
+ * @compile -processor org.checkerframework.checker.nullness.NullnessChecker -Astubs=NoPackage.astub Driver2.java -Werror
  */
 
 public class Driver2 {

diff --git a/checker/jtreg/stubs/issue1356/Main.java b/checker/jtreg/stubs/issue1356/Main.java
@@ -3,8 +3,8 @@
  * @ignore
  * @summary Test case for Issue 1356.
  * https://github.com/typetools/checker-framework/issues/1356
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.regex.RegexChecker -Astubs=MyClass.astub mypackage/MyClass.java -Werror -AstubWarnIfNotFound
- * @compile -XDrawDiagnostics -processor org.checkerframework.checker.regex.RegexChecker mypackage/UseMyClass.java
+ * @compile -processor org.checkerframework.checker.regex.RegexChecker -Astubs=MyClass.astub mypackage/MyClass.java -Werror -AstubWarnIfNotFound
+ * @compile -processor org.checkerframework.checker.regex.RegexChecker mypackage/UseMyClass.java
  */
 
 public class Main {}