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

Reviewed-by: vromero
2018-07-16 21:53:49 -07:00 · 2018-07-16 21:53:49 -07:00 · a376d5dab4
commit a376d5dab4
parent 769e802001
17 changed files with 11 additions and 41 deletions
--- a/test/langtools/tools/javac/TryWithResources/WeirdTwr.out
+++ b/test/langtools/tools/javac/TryWithResources/WeirdTwr.out
@ -1,6 +0,0 @@
- 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
--- 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
--- a/test/langtools/tools/javac/depDocComment/SuppressDeprecation8.out
+++ b/test/langtools/tools/javac/depDocComment/SuppressDeprecation8.out
@ -1,4 +1,3 @@
- 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
@ -6,4 +5,4 @@ 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
--- 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.*;

--- 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 { }
--- 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 {
 }
--- 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() {}
--- 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() {
--- 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
 *
 */

--- 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
--- 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
 *
 */

--- 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
--- 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
 *
 */

--- 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
--- 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
 *
 */

--- 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
--- a/test/langtools/tools/javac/warnings/6594914/T6594914b.out
+++ b/test/langtools/tools/javac/warnings/6594914/T6594914b.out
@ -1,10 +0,0 @@
- compiler.warn.source.no.bootclasspath: 1.8
-T6594914b.java:12:22: compiler.warn.sun.proprietary: sun.security.x509.X509CertInfo
-T6594914b.java:17:33: compiler.warn.sun.proprietary: sun.security.x509.X509CertInfo
-T6594914b.java:18:22: compiler.warn.sun.proprietary: sun.security.x509.X509CertInfo
-T6594914b.java:19:37: compiler.warn.sun.proprietary: sun.security.x509.CertException
-T6594914b.java:18:56: compiler.warn.sun.proprietary: sun.security.x509.X509CertInfo
-T6594914b.java:27:26: compiler.warn.sun.proprietary: sun.security.x509.X509CertInfo
- compiler.note.deprecated.filename: T6594914b.java
- compiler.note.deprecated.recompile
-7 warnings