8207248: Reduce incidence of compiler.warn.source.no.bootclasspath in javac tests

GoeLin · GoeLin · commit 5685e581bf52 · 2023-02-16T10:19:35.000Z
Reviewed-by: clanger, phh Backport-of: a376d5d
diff --git a/test/langtools/tools/javac/TryWithResources/WeirdTwr.java b/test/langtools/tools/javac/TryWithResources/WeirdTwr.java
@@ -3,7 +3,7 @@
  * @bug 6911256 6964740
  * @author Joseph D. Darcy
  * @summary Strange TWRs
- * @compile/fail/ref=WeirdTwr.out -XDrawDiagnostics -source 6 WeirdTwr.java
+ * @compile/fail/ref=WeirdTwr.out -XDrawDiagnostics -Xlint:-options -source 6 WeirdTwr.java
  * @compile WeirdTwr.java
  * @run main WeirdTwr
  */
diff --git a/test/langtools/tools/javac/TryWithResources/WeirdTwr.out b/test/langtools/tools/javac/TryWithResources/WeirdTwr.out
@@ -1,6 +1,2 @@
-- compiler.warn.source.no.bootclasspath: 6
-- compiler.warn.option.obsolete.source: 6
-- compiler.warn.option.obsolete.suppression
 WeirdTwr.java:14:12: compiler.err.feature.not.supported.in.source: (compiler.misc.feature.try.with.resources), 6, 7
 1 error
-3 warnings
diff --git a/test/langtools/tools/javac/depDocComment/SuppressDeprecation.java b/test/langtools/tools/javac/depDocComment/SuppressDeprecation.java
@@ -5,7 +5,7 @@
  * @author gafter
  *
  * @compile/ref=SuppressDeprecation.out -Xlint:deprecation -XDrawDiagnostics SuppressDeprecation.java
- * @compile/ref=SuppressDeprecation8.out -source 8 -Xlint:deprecation -XDrawDiagnostics SuppressDeprecation.java
+ * @compile/ref=SuppressDeprecation8.out -source 8 -Xlint:deprecation -XDrawDiagnostics -Xlint:-options SuppressDeprecation.java
  */
 
 /* Test for the contexts in which deprecations warnings should
diff --git a/test/langtools/tools/javac/depDocComment/SuppressDeprecation8.out b/test/langtools/tools/javac/depDocComment/SuppressDeprecation8.out
@@ -1,9 +1,8 @@
-- compiler.warn.source.no.bootclasspath: 8
 SuppressDeprecation.java:83:10: compiler.warn.has.been.deprecated: g(), T
 SuppressDeprecation.java:84:14: compiler.warn.has.been.deprecated: g(), T
 SuppressDeprecation.java:85:9: compiler.warn.has.been.deprecated: var, T
 SuppressDeprecation.java:88:9: compiler.warn.has.been.deprecated: T(), T
 SuppressDeprecation.java:91:9: compiler.warn.has.been.deprecated: T(int), T
 SuppressDeprecation.java:99:1: compiler.warn.has.been.deprecated: T(), T
 SuppressDeprecation.java:131:17: compiler.warn.has.been.deprecated: X, compiler.misc.unnamed.package
-8 warnings
+7 warnings
diff --git a/test/langtools/tools/javac/diags/examples/DiamondAndAnonClass.java b/test/langtools/tools/javac/diags/examples/DiamondAndAnonClass.java
@@ -24,8 +24,7 @@
 // key: compiler.misc.feature.not.supported.in.source
 // key: compiler.misc.feature.diamond.and.anon.class
 // key: compiler.err.cant.apply.diamond.1
-// key: compiler.warn.source.no.bootclasspath
-// options: -source 8
+// options: -source 8 -Xlint:-options
 
 import java.util.*;
 
diff --git a/test/langtools/tools/javac/diags/examples/DirPathElementNotFound.java b/test/langtools/tools/javac/diags/examples/DirPathElementNotFound.java
@@ -22,8 +22,7 @@
  */
 
 // key: compiler.warn.dir.path.element.not.found
-// key: compiler.warn.source.no.bootclasspath
-// options: -Xlint:path -source 8 -target 8 -extdirs DoesNotExist
+// options: -Xlint:path,-options -source 8 -target 8 -extdirs DoesNotExist
 // run: simple
 
 class DirPathElementNotFound { }
diff --git a/test/langtools/tools/javac/diags/examples/ModulesNotSupportedInSource/module-info.java b/test/langtools/tools/javac/diags/examples/ModulesNotSupportedInSource/module-info.java
@@ -23,8 +23,7 @@
 
 // key: compiler.err.feature.not.supported.in.source.plural
 // key: compiler.misc.feature.modules
-// key: compiler.warn.source.no.bootclasspath
-// options: -source 8 -Xlint:-path
+// options: -source 8 -Xlint:-path,-options
 
 module ModulesNotSupportedInSource {
 }
diff --git a/test/langtools/tools/javac/diags/examples/PrivateInterfaceMethodsNotSupported.java b/test/langtools/tools/javac/diags/examples/PrivateInterfaceMethodsNotSupported.java
@@ -23,8 +23,7 @@
 
 // key: compiler.err.feature.not.supported.in.source.plural
 // key: compiler.misc.feature.private.intf.methods
-// key: compiler.warn.source.no.bootclasspath
-// options: -source 8
+// options: -source 8 -Xlint:-options
 
 interface PrivateInterfaceMethodsNotSupported {
     private void foo() {}
diff --git a/test/langtools/tools/javac/diags/examples/VarInTryWithResourcesNotSupportedInSource.java b/test/langtools/tools/javac/diags/examples/VarInTryWithResourcesNotSupportedInSource.java
@@ -23,8 +23,7 @@
 
 // key: compiler.err.feature.not.supported.in.source.plural
 // key: compiler.misc.feature.var.in.try.with.resources
-// key: compiler.warn.source.no.bootclasspath
-// options: -source 8
+// options: -source 8 -Xlint:-options
 
 class VarInTryWithResourcesNotSupportedInSource {
     void m() {
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg09a.java b/test/langtools/tools/javac/generics/diamond/neg/Neg09a.java
@@ -4,7 +4,7 @@
  *
  * @summary  Check that diamond is not allowed with anonymous inner class expressions at source < 9
  * @author Maurizio Cimadamore
- * @compile/fail/ref=Neg09a.out Neg09a.java -source 8 -XDrawDiagnostics
+ * @compile/fail/ref=Neg09a.out Neg09a.java -source 8 -XDrawDiagnostics -Xlint:-options
  *
  */
 
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg09a.out b/test/langtools/tools/javac/generics/diamond/neg/Neg09a.out
@@ -1,4 +1,2 @@
-- compiler.warn.source.no.bootclasspath: 8
 Neg09a.java:15:34: compiler.err.cant.apply.diamond.1: Neg09a.Member<X>, (compiler.misc.feature.not.supported.in.source: (compiler.misc.feature.diamond.and.anon.class), 8, 9)
 1 error
-1 warning
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg09b.java b/test/langtools/tools/javac/generics/diamond/neg/Neg09b.java
@@ -4,7 +4,7 @@
  *
  * @summary  Check that diamond is not allowed with anonymous inner class expressions at source < 9
  * @author Maurizio Cimadamore
- * @compile/fail/ref=Neg09b.out Neg09b.java -source 8 -XDrawDiagnostics
+ * @compile/fail/ref=Neg09b.out Neg09b.java -source 8 -XDrawDiagnostics -Xlint:-options
  *
  */
 
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg09b.out b/test/langtools/tools/javac/generics/diamond/neg/Neg09b.out
@@ -1,4 +1,2 @@
-- compiler.warn.source.no.bootclasspath: 8
 Neg09b.java:16:34: compiler.err.cant.apply.diamond.1: Neg09b.Nested<X>, (compiler.misc.feature.not.supported.in.source: (compiler.misc.feature.diamond.and.anon.class), 8, 9)
 1 error
-1 warning
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg09c.java b/test/langtools/tools/javac/generics/diamond/neg/Neg09c.java
@@ -4,7 +4,7 @@
  *
  * @summary  Check that diamond is not allowed with anonymous inner class expressions at source < 9
  * @author Maurizio Cimadamore
- * @compile/fail/ref=Neg09c.out Neg09c.java -source 8 -XDrawDiagnostics
+ * @compile/fail/ref=Neg09c.out Neg09c.java -source 8 -XDrawDiagnostics -Xlint:-options
  *
  */
 
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg09c.out b/test/langtools/tools/javac/generics/diamond/neg/Neg09c.out
@@ -1,4 +1,2 @@
-- compiler.warn.source.no.bootclasspath: 8
 Neg09c.java:15:39: compiler.err.cant.apply.diamond.1: Neg09c.Member<X>, (compiler.misc.feature.not.supported.in.source: (compiler.misc.feature.diamond.and.anon.class), 8, 9)
 1 error
-1 warning
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg09d.java b/test/langtools/tools/javac/generics/diamond/neg/Neg09d.java
@@ -4,7 +4,7 @@
  *
  * @summary  Check that diamond is not allowed with anonymous inner class expressions at source < 9
  * @author Maurizio Cimadamore
- * @compile/fail/ref=Neg09d.out Neg09d.java -source 8 -XDrawDiagnostics
+ * @compile/fail/ref=Neg09d.out Neg09d.java -source 8 -XDrawDiagnostics -Xlint:-options
  *
  */
 
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg09d.out b/test/langtools/tools/javac/generics/diamond/neg/Neg09d.out
@@ -1,4 +1,2 @@
-- compiler.warn.source.no.bootclasspath: 8
 Neg09d.java:16:33: compiler.err.doesnt.exist: Neg09
 1 error
-1 warning
diff --git a/test/langtools/tools/javac/warnings/6594914/T6594914b.out b/test/langtools/tools/javac/warnings/6594914/T6594914b.out

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* @author gafter`
`6`	`6`	`*`
`7`	`7`	`* @compile/ref=SuppressDeprecation.out -Xlint:deprecation -XDrawDiagnostics SuppressDeprecation.java`
`8`		`- * @compile/ref=SuppressDeprecation8.out -source 8 -Xlint:deprecation -XDrawDiagnostics SuppressDeprecation.java`
	`8`	`+ * @compile/ref=SuppressDeprecation8.out -source 8 -Xlint:deprecation -XDrawDiagnostics -Xlint:-options SuppressDeprecation.java`
`9`	`9`	`*/`
`10`	`10`
`11`	`11`	`/* Test for the contexts in which deprecations warnings should`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@`
`23`	`23`
`24`	`24`	`// key: compiler.err.feature.not.supported.in.source.plural`
`25`	`25`	`// key: compiler.misc.feature.modules`
`26`		`-// key: compiler.warn.source.no.bootclasspath`
`27`		`-// options: -source 8 -Xlint:-path`
	`26`	`+// options: -source 8 -Xlint:-path,-options`
`28`	`27`
`29`	`28`	`module ModulesNotSupportedInSource {`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* @summary Check that diamond is not allowed with anonymous inner class expressions at source < 9`
`6`	`6`	`* @author Maurizio Cimadamore`
`7`		`- * @compile/fail/ref=Neg09a.out Neg09a.java -source 8 -XDrawDiagnostics`
	`7`	`+ * @compile/fail/ref=Neg09a.out Neg09a.java -source 8 -XDrawDiagnostics -Xlint:-options`
`8`	`8`	`*`
`9`	`9`	`*/`
`10`	`10`