changeset 50963:999f09bf3464

8206439: Remove javac -source/-target 6 from langtools regression tests Reviewed-by: mcimadamore
author darcy
date Fri, 06 Jul 2018 10:28:56 -0700
parents ec3221b8a109
children fa2f93f99dbc
files test/langtools/tools/javac/6558548/T6558548.java test/langtools/tools/javac/6558548/T6558548_6.out test/langtools/tools/javac/6558548/T6558548_latest.out test/langtools/tools/javac/8013179/T8013179.java test/langtools/tools/javac/8013179/T8013179.out test/langtools/tools/javac/8074306/TestSyntheticNullChecks.java test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1.java test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1.out test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1_6.out test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2.java test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2.out test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2_6.out test/langtools/tools/javac/StringsInSwitch/NonConstantLabel.java test/langtools/tools/javac/StringsInSwitch/NonConstantLabel.out test/langtools/tools/javac/StringsInSwitch/NonConstantLabel6.out test/langtools/tools/javac/StringsInSwitch/OneCaseSwitches.java test/langtools/tools/javac/StringsInSwitch/OneCaseSwitches.out test/langtools/tools/javac/StringsInSwitch/RSCL1.out test/langtools/tools/javac/StringsInSwitch/RSCL1_6.out test/langtools/tools/javac/StringsInSwitch/RSCL2.out test/langtools/tools/javac/StringsInSwitch/RSCL2_6.out test/langtools/tools/javac/StringsInSwitch/RepeatedStringCaseLabels1.java test/langtools/tools/javac/StringsInSwitch/RepeatedStringCaseLabels2.java test/langtools/tools/javac/TryWithResources/BadTwr.java test/langtools/tools/javac/TryWithResources/BadTwr.out test/langtools/tools/javac/TryWithResources/BadTwr6.out test/langtools/tools/javac/TryWithResources/BadTwrSyntax.java test/langtools/tools/javac/TryWithResources/BadTwrSyntax.out test/langtools/tools/javac/TryWithResources/BadTwrSyntax6.out test/langtools/tools/javac/TryWithResources/PlainTry.java test/langtools/tools/javac/TryWithResources/PlainTry.out test/langtools/tools/javac/TryWithResources/PlainTry6.out test/langtools/tools/javac/TryWithResources/TwrOnNonResource.java test/langtools/tools/javac/TryWithResources/TwrOnNonResource.out test/langtools/tools/javac/TryWithResources/TwrOnNonResource6.out test/langtools/tools/javac/TryWithResources/WeirdTwr.java test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion.java test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion6.out test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion7.out test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out test/langtools/tools/javac/classfiles/ClassVersionChecker.java test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified.java test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified6.out test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified7.out test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple.java test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple6.out test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple7.out test/langtools/tools/javac/literals/BadBinaryLiterals.6.out test/langtools/tools/javac/literals/BadBinaryLiterals.7.out test/langtools/tools/javac/literals/BadBinaryLiterals.java test/langtools/tools/javac/literals/BadUnderscoreLiterals.6.out test/langtools/tools/javac/literals/BadUnderscoreLiterals.7.out test/langtools/tools/javac/literals/BadUnderscoreLiterals.java test/langtools/tools/javac/mixedTarget/ExtendCovariant2.java test/langtools/tools/javac/multicatch/Neg01.java test/langtools/tools/javac/multicatch/Neg01.out test/langtools/tools/javac/multicatch/Neg01eff_final.java test/langtools/tools/javac/multicatch/Neg01eff_final.out test/langtools/tools/javac/processing/warnings/TestSourceVersionWarnings.java test/langtools/tools/javac/processing/warnings/gold_sv_warn_5_6.out test/langtools/tools/javac/types/CastObjectToPrimitiveTest.java test/langtools/tools/javac/types/CastObjectToPrimitiveTest.out test/langtools/tools/javac/versions/Versions.java
diffstat 66 files changed, 67 insertions(+), 235 deletions(-) [+]
line wrap: on
line diff
--- a/test/langtools/tools/javac/6558548/T6558548.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/6558548/T6558548.java	Fri Jul 06 10:28:56 2018 -0700
@@ -3,7 +3,6 @@
  * @bug     6558548 7039937
  * @summary The compiler needs to be aligned with clarified specification of throws
  * @compile/fail/ref=T6558548_latest.out -XDrawDiagnostics T6558548.java
- * @compile/fail/ref=T6558548_6.out -source 6 -Xlint:-options -XDrawDiagnostics T6558548.java
  */
 
 class T6558548 {
--- a/test/langtools/tools/javac/6558548/T6558548_6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-T6558548.java:168:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:177:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:248:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:258:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:300:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:307:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-6 errors
--- a/test/langtools/tools/javac/6558548/T6558548_latest.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/6558548/T6558548_latest.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,9 +1,9 @@
-T6558548.java:20:9: compiler.warn.unreachable.catch: java.io.FileNotFoundException
-T6558548.java:168:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:177:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:248:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:258:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:300:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:307:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:19:9: compiler.warn.unreachable.catch: java.io.FileNotFoundException
+T6558548.java:167:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:176:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:247:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:257:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:299:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:306:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
 6 errors
 1 warning
--- a/test/langtools/tools/javac/8013179/T8013179.java	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-/*
- * @test /nodynamiccopyright/
- * @bug 8013179
- * @summary assertion failure in javac when compiling with -source 1.6 -target 1.6
- * @compile/fail/ref=T8013179.out -source 6 -target 6 -Xlint:-options -XDrawDiagnostics T8013179.java
- */
-
-import java.lang.invoke.MethodHandle;
-
-class T8013179 {
-    static MethodHandle getNamedMember;
-    public static Object getMember(String name, Object rec) throws Throwable {
-        return getNamedMember.invoke(rec, name);
-    }
-}
--- a/test/langtools/tools/javac/8013179/T8013179.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-T8013179.java:13:37: compiler.err.bad.target.sigpoly.call: 1.6, 1.7
-1 error
--- a/test/langtools/tools/javac/8074306/TestSyntheticNullChecks.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/8074306/TestSyntheticNullChecks.java	Fri Jul 06 10:28:56 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,6 @@
  * @test
  * @bug 8074306 8073432 8074501
  * @summary NULLCHK is emitted as Object.getClass
- * @compile -source 6 -target 6 TestSyntheticNullChecks.java
- * @run main TestSyntheticNullChecks 6
- * @clean TestSyntheticNullChecks*
  * @compile -source 7 -target 7 TestSyntheticNullChecks.java
  * @run main TestSyntheticNullChecks 7
  * @clean TestSyntheticNullChecks*
--- a/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java	Fri Jul 06 10:28:56 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,10 +35,6 @@
  * @modules jdk.jdeps/com.sun.tools.classfile
  *
  * @clean TestIndyStringConcat*
- * @compile -source 6 -target 6 TestIndyStringConcat.java
- * @run main TestIndyStringConcat false
- *
- * @clean TestIndyStringConcat*
  * @compile -source 7 -target 7 TestIndyStringConcat.java
  * @run main TestIndyStringConcat false
  *
--- a/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1.java	Fri Jul 06 10:28:56 2018 -0700
@@ -2,7 +2,6 @@
  * @test  /nodynamiccopyright/
  * @bug 6827009
  * @summary Check for case labels of different types.
- * @compile/fail/ref=BadlyTypedLabel1_6.out -XDrawDiagnostics -source 6 BadlyTypedLabel1.java
  * @compile/fail/ref=BadlyTypedLabel1.out -XDrawDiagnostics BadlyTypedLabel1.java
  */
 class BadlyTypedLabel1 {
--- a/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-BadlyTypedLabel1.java:13:14: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
+BadlyTypedLabel1.java:12:14: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
 1 error
--- a/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1_6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-- compiler.warn.source.no.bootclasspath: 6
-- compiler.warn.option.obsolete.source: 6
-- compiler.warn.option.obsolete.suppression
-BadlyTypedLabel1.java:10:15: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.string.switch), 6, 7
-BadlyTypedLabel1.java:13:14: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
-2 errors
-3 warnings
--- a/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2.java	Fri Jul 06 10:28:56 2018 -0700
@@ -2,7 +2,6 @@
  * @test  /nodynamiccopyright/
  * @bug 6827009
  * @summary Check for case lables of different types.
- * @compile/fail/ref=BadlyTypedLabel2_6.out -XDrawDiagnostics -source 6 BadlyTypedLabel2.java
  * @compile/fail/ref=BadlyTypedLabel2.out -XDrawDiagnostics BadlyTypedLabel2.java
  */
 import static java.math.RoundingMode.*;
--- a/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-BadlyTypedLabel2.java:15:14: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.math.RoundingMode, java.lang.String)
+BadlyTypedLabel2.java:14:14: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.math.RoundingMode, java.lang.String)
 1 error
--- a/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2_6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-- compiler.warn.source.no.bootclasspath: 6
-- compiler.warn.option.obsolete.source: 6
-- compiler.warn.option.obsolete.suppression
-BadlyTypedLabel2.java:12:15: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.string.switch), 6, 7
-BadlyTypedLabel2.java:15:14: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.math.RoundingMode, java.lang.String)
-2 errors
-3 warnings
--- a/test/langtools/tools/javac/StringsInSwitch/NonConstantLabel.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/StringsInSwitch/NonConstantLabel.java	Fri Jul 06 10:28:56 2018 -0700
@@ -2,7 +2,6 @@
  * @test  /nodynamiccopyright/
  * @bug 6827009
  * @summary Check for non-constant case labels.
- * @compile/fail/ref=NonConstantLabel6.out -XDrawDiagnostics -source 6 NonConstantLabel.java
  * @compile/fail/ref=NonConstantLabel.out -XDrawDiagnostics NonConstantLabel.java
  */
 class NonConstantLabel {
--- a/test/langtools/tools/javac/StringsInSwitch/NonConstantLabel.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/StringsInSwitch/NonConstantLabel.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-NonConstantLabel.java:14:14: compiler.err.string.const.req
+NonConstantLabel.java:13:14: compiler.err.string.const.req
 1 error
--- a/test/langtools/tools/javac/StringsInSwitch/NonConstantLabel6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-- compiler.warn.source.no.bootclasspath: 6
-- compiler.warn.option.obsolete.source: 6
-- compiler.warn.option.obsolete.suppression
-NonConstantLabel.java:11:15: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.string.switch), 6, 7
-NonConstantLabel.java:14:14: compiler.err.string.const.req
-2 errors
-3 warnings
--- a/test/langtools/tools/javac/StringsInSwitch/OneCaseSwitches.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/StringsInSwitch/OneCaseSwitches.java	Fri Jul 06 10:28:56 2018 -0700
@@ -2,7 +2,6 @@
  * @test /nodynamiccopyright/
  * @bug 6827009 8078561
  * @summary Positive tests for strings in switch with few alternatives.
- * @compile/fail/ref=OneCaseSwitches.out -XDrawDiagnostics -source 6 OneCaseSwitches.java
  * @compile          OneCaseSwitches.java
  * @run main OneCaseSwitches
  * @author  Joseph D. Darcy
--- a/test/langtools/tools/javac/StringsInSwitch/OneCaseSwitches.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-- compiler.warn.source.no.bootclasspath: 6
-- compiler.warn.option.obsolete.source: 6
-- compiler.warn.option.obsolete.suppression
-OneCaseSwitches.java:23:15: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.string.switch), 6, 7
-1 error
-3 warnings
--- a/test/langtools/tools/javac/StringsInSwitch/RSCL1.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/StringsInSwitch/RSCL1.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-RepeatedStringCaseLabels1.java:13:9: compiler.err.duplicate.case.label
+RepeatedStringCaseLabels1.java:12:9: compiler.err.duplicate.case.label
 1 error
--- a/test/langtools/tools/javac/StringsInSwitch/RSCL1_6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-- compiler.warn.source.no.bootclasspath: 6
-- compiler.warn.option.obsolete.source: 6
-- compiler.warn.option.obsolete.suppression
-RepeatedStringCaseLabels1.java:10:15: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.string.switch), 6, 7
-RepeatedStringCaseLabels1.java:13:9: compiler.err.duplicate.case.label
-2 errors
-3 warnings
--- a/test/langtools/tools/javac/StringsInSwitch/RSCL2.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/StringsInSwitch/RSCL2.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-RepeatedStringCaseLabels2.java:14:9: compiler.err.duplicate.case.label
+RepeatedStringCaseLabels2.java:13:9: compiler.err.duplicate.case.label
 1 error
--- a/test/langtools/tools/javac/StringsInSwitch/RSCL2_6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-- compiler.warn.source.no.bootclasspath: 6
-- compiler.warn.option.obsolete.source: 6
-- compiler.warn.option.obsolete.suppression
-RepeatedStringCaseLabels2.java:11:15: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.string.switch), 6, 7
-RepeatedStringCaseLabels2.java:14:9: compiler.err.duplicate.case.label
-2 errors
-3 warnings
--- a/test/langtools/tools/javac/StringsInSwitch/RepeatedStringCaseLabels1.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/StringsInSwitch/RepeatedStringCaseLabels1.java	Fri Jul 06 10:28:56 2018 -0700
@@ -2,7 +2,6 @@
  * @test  /nodynamiccopyright/
  * @bug 6827009
  * @summary Check for repeated string case labels.
- * @compile/fail/ref=RSCL1_6.out -XDrawDiagnostics -source 6 RepeatedStringCaseLabels1.java
  * @compile/fail/ref=RSCL1.out -XDrawDiagnostics RepeatedStringCaseLabels1.java
  */
 class RepeatedStringCaseLabels1 {
--- a/test/langtools/tools/javac/StringsInSwitch/RepeatedStringCaseLabels2.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/StringsInSwitch/RepeatedStringCaseLabels2.java	Fri Jul 06 10:28:56 2018 -0700
@@ -2,7 +2,6 @@
  * @test  /nodynamiccopyright/
  * @bug 6827009
  * @summary Check for repeated string case labels.
- * @compile/fail/ref=RSCL2_6.out -XDrawDiagnostics -source 6 RepeatedStringCaseLabels2.java
  * @compile/fail/ref=RSCL2.out -XDrawDiagnostics RepeatedStringCaseLabels2.java
  */
 class RepeatedStringCaseLabels2 {
--- a/test/langtools/tools/javac/TryWithResources/BadTwr.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/TryWithResources/BadTwr.java	Fri Jul 06 10:28:56 2018 -0700
@@ -3,7 +3,6 @@
  * @bug 6911256 6964740
  * @author Joseph D. Darcy
  * @summary Verify bad TWRs don't compile
- * @compile/fail/ref=BadTwr6.out -XDrawDiagnostics -source 6 BadTwr.java
  * @compile/fail/ref=BadTwr.out -XDrawDiagnostics BadTwr.java
  */
 
--- a/test/langtools/tools/javac/TryWithResources/BadTwr.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/TryWithResources/BadTwr.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,5 +1,5 @@
-BadTwr.java:13:46: compiler.err.already.defined: kindname.variable, r1, kindname.method, main(java.lang.String...)
-BadTwr.java:18:20: compiler.err.already.defined: kindname.variable, args, kindname.method, main(java.lang.String...)
-BadTwr.java:21:13: compiler.err.cant.assign.val.to.final.var: thatsIt
-BadTwr.java:26:24: compiler.err.already.defined: kindname.variable, name, kindname.method, main(java.lang.String...)
+BadTwr.java:12:46: compiler.err.already.defined: kindname.variable, r1, kindname.method, main(java.lang.String...)
+BadTwr.java:17:20: compiler.err.already.defined: kindname.variable, args, kindname.method, main(java.lang.String...)
+BadTwr.java:20:13: compiler.err.cant.assign.val.to.final.var: thatsIt
+BadTwr.java:25:24: compiler.err.already.defined: kindname.variable, name, kindname.method, main(java.lang.String...)
 4 errors
--- a/test/langtools/tools/javac/TryWithResources/BadTwr6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-- compiler.warn.source.no.bootclasspath: 6
-- compiler.warn.option.obsolete.source: 6
-- compiler.warn.option.obsolete.suppression
-BadTwr.java:13: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/TryWithResources/BadTwrSyntax.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/TryWithResources/BadTwrSyntax.java	Fri Jul 06 10:28:56 2018 -0700
@@ -3,7 +3,6 @@
  * @bug 6911256 6964740
  * @author Joseph D. Darcy
  * @summary Verify bad TWRs don't compile
- * @compile/fail/ref=BadTwrSyntax6.out -XDrawDiagnostics -source 6 BadTwrSyntax.java
  * @compile/fail/ref=BadTwrSyntax.out -XDrawDiagnostics BadTwrSyntax.java
  */
 
--- a/test/langtools/tools/javac/TryWithResources/BadTwrSyntax.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/TryWithResources/BadTwrSyntax.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-BadTwrSyntax.java:14:43: compiler.err.illegal.start.of.expr
+BadTwrSyntax.java:13:43: compiler.err.illegal.start.of.expr
 1 error
--- a/test/langtools/tools/javac/TryWithResources/BadTwrSyntax6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-- compiler.warn.source.no.bootclasspath: 6
-- compiler.warn.option.obsolete.source: 6
-- compiler.warn.option.obsolete.suppression
-BadTwrSyntax.java:14:12: compiler.err.feature.not.supported.in.source: (compiler.misc.feature.try.with.resources), 6, 7
-BadTwrSyntax.java:14:43: compiler.err.illegal.start.of.expr
-2 errors
-3 warnings
--- a/test/langtools/tools/javac/TryWithResources/PlainTry.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/TryWithResources/PlainTry.java	Fri Jul 06 10:28:56 2018 -0700
@@ -3,7 +3,6 @@
  * @bug 6911256 6964740
  * @author Joseph D. Darcy
  * @summary Test error messages for an unadorned try
- * @compile/fail/ref=PlainTry6.out -XDrawDiagnostics -source 6 -Xlint:-options PlainTry.java
  * @compile/fail/ref=PlainTry.out  -XDrawDiagnostics                           PlainTry.java
  */
 public class PlainTry {
--- a/test/langtools/tools/javac/TryWithResources/PlainTry.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/TryWithResources/PlainTry.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-PlainTry.java:11:9: compiler.err.try.without.catch.finally.or.resource.decls
+PlainTry.java:10:9: compiler.err.try.without.catch.finally.or.resource.decls
 1 error
--- a/test/langtools/tools/javac/TryWithResources/PlainTry6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-PlainTry.java:11:9: compiler.err.try.without.catch.or.finally
-1 error
--- a/test/langtools/tools/javac/TryWithResources/TwrOnNonResource.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/TryWithResources/TwrOnNonResource.java	Fri Jul 06 10:28:56 2018 -0700
@@ -3,7 +3,6 @@
  * @bug 6911256 6964740 7013420
  * @author Joseph D. Darcy
  * @summary Verify invalid TWR block is not accepted.
- * @compile/fail/ref=TwrOnNonResource6.out -XDrawDiagnostics -source 6 TwrOnNonResource.java
  * @compile/fail/ref=TwrOnNonResource.out -XDrawDiagnostics TwrOnNonResource.java
  */
 
--- a/test/langtools/tools/javac/TryWithResources/TwrOnNonResource.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/TryWithResources/TwrOnNonResource.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,4 +1,4 @@
-TwrOnNonResource.java:12:30: compiler.err.prob.found.req: (compiler.misc.try.not.applicable.to.type: (compiler.misc.inconvertible.types: TwrOnNonResource, java.lang.AutoCloseable))
-TwrOnNonResource.java:15:30: compiler.err.prob.found.req: (compiler.misc.try.not.applicable.to.type: (compiler.misc.inconvertible.types: TwrOnNonResource, java.lang.AutoCloseable))
-TwrOnNonResource.java:18:30: compiler.err.prob.found.req: (compiler.misc.try.not.applicable.to.type: (compiler.misc.inconvertible.types: TwrOnNonResource, java.lang.AutoCloseable))
+TwrOnNonResource.java:11:30: compiler.err.prob.found.req: (compiler.misc.try.not.applicable.to.type: (compiler.misc.inconvertible.types: TwrOnNonResource, java.lang.AutoCloseable))
+TwrOnNonResource.java:14:30: compiler.err.prob.found.req: (compiler.misc.try.not.applicable.to.type: (compiler.misc.inconvertible.types: TwrOnNonResource, java.lang.AutoCloseable))
+TwrOnNonResource.java:17:30: compiler.err.prob.found.req: (compiler.misc.try.not.applicable.to.type: (compiler.misc.inconvertible.types: TwrOnNonResource, java.lang.AutoCloseable))
 3 errors
--- a/test/langtools/tools/javac/TryWithResources/TwrOnNonResource6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-- compiler.warn.source.no.bootclasspath: 6
-- compiler.warn.option.obsolete.source: 6
-- compiler.warn.option.obsolete.suppression
-TwrOnNonResource.java:12: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/TryWithResources/WeirdTwr.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/TryWithResources/WeirdTwr.java	Fri Jul 06 10:28:56 2018 -0700
@@ -3,7 +3,6 @@
  * @bug 6911256 6964740
  * @author Joseph D. Darcy
  * @summary Strange TWRs
- * @compile/fail/ref=WeirdTwr.out -XDrawDiagnostics -source 6 WeirdTwr.java
  * @compile WeirdTwr.java
  * @run main WeirdTwr
  */
--- a/test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion.java	Fri Jul 06 10:28:56 2018 -0700
@@ -5,7 +5,6 @@
  * @compile WrongVersion.java
  * @compile -Xlint:-options -source 8 WrongVersion.java
  * @compile/fail/ref=WrongVersion7.out -XDrawDiagnostics -Xlint:-options -source 7 WrongVersion.java
- * @compile/fail/ref=WrongVersion6.out -XDrawDiagnostics -Xlint:-options -source 6 WrongVersion.java
  */
 import java.lang.annotation.Repeatable;
 
--- a/test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-WrongVersion.java:12:9: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.repeatable.annotations), 6, 8
-1 error
--- a/test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion7.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion7.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-WrongVersion.java:12:9: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.repeatable.annotations), 7, 8
+WrongVersion.java:11:9: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.repeatable.annotations), 7, 8
 1 error
--- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java	Fri Jul 06 10:28:56 2018 -0700
@@ -4,7 +4,6 @@
  * @summary test that only Java 8 allows type annotations
  * @author Mahmood Ali
  * @compile AnnotationVersion.java
- * @compile/fail/ref=AnnotationVersion.out -XDrawDiagnostics -Xlint:-options -source 1.6 AnnotationVersion.java
  * @compile/fail/ref=AnnotationVersion7.out -XDrawDiagnostics -Xlint:-options -source 1.7 AnnotationVersion.java
  */
 import java.lang.annotation.*;
--- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-AnnotationVersion.java:12:27: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.type.annotations), 6, 8
-1 error
--- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-AnnotationVersion.java:12:27: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.type.annotations), 7, 8
+AnnotationVersion.java:11:27: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.type.annotations), 7, 8
 1 error
--- a/test/langtools/tools/javac/classfiles/ClassVersionChecker.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/classfiles/ClassVersionChecker.java	Fri Jul 06 10:28:56 2018 -0700
@@ -42,7 +42,6 @@
  */
 public class ClassVersionChecker {
     private static enum Version {
-        SIX("6", 50),
         SEVEN("7", 51),
         EIGHT("8", 52),
         NINE("9", 53),
--- a/test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified.java	Fri Jul 06 10:28:56 2018 -0700
@@ -1,9 +1,8 @@
 /* @test /nodynamiccopyright/
  * @bug 8037385
  * @summary Must not allow static interface method invocation in legacy code
- * @compile -source 8 -Xlint:-options StaticInvokeQualified.java
+ * @compile -Xlint:-options StaticInvokeQualified.java
  * @compile/fail/ref=StaticInvokeQualified7.out -source 7 -Xlint:-options -XDrawDiagnostics StaticInvokeQualified.java
- * @compile/fail/ref=StaticInvokeQualified6.out -source 6 -Xlint:-options -XDrawDiagnostics StaticInvokeQualified.java
  */
 
 class StaticInvokeQualified {
--- a/test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-StaticInvokeQualified.java:11:32: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.static.intf.method.invoke), 6, 8
-1 error
--- a/test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified7.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified7.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-StaticInvokeQualified.java:11:32: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.static.intf.method.invoke), 7, 8
+StaticInvokeQualified.java:10:32: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.static.intf.method.invoke), 7, 8
 1 error
--- a/test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple.java	Fri Jul 06 10:28:56 2018 -0700
@@ -1,9 +1,8 @@
 /* @test /nodynamiccopyright/
  * @bug 8037385
  * @summary Must not allow static interface method invocation in legacy code
- * @compile -source 8 -Xlint:-options StaticInvokeSimple.java
+ * @compile -Xlint:-options StaticInvokeSimple.java
  * @compile/fail/ref=StaticInvokeSimple7.out -source 7 -Xlint:-options -XDrawDiagnostics StaticInvokeSimple.java
- * @compile/fail/ref=StaticInvokeSimple6.out -source 6 -Xlint:-options -XDrawDiagnostics StaticInvokeSimple.java
  */
 import java.util.stream.Stream;
 
--- a/test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-StaticInvokeSimple.java:12:15: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.static.intf.method.invoke), 6, 8
-1 error
--- a/test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple7.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple7.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-StaticInvokeSimple.java:12:15: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.static.intf.method.invoke), 7, 8
+StaticInvokeSimple.java:11:15: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.static.intf.method.invoke), 7, 8
 1 error
--- a/test/langtools/tools/javac/literals/BadBinaryLiterals.6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-BadBinaryLiterals.java:10:17: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.binary.lit), 6, 7
-BadBinaryLiterals.java:11:24: compiler.err.expected: ';'
-BadBinaryLiterals.java:16:27: compiler.err.expected: ';'
-BadBinaryLiterals.java:17:27: compiler.err.expected: ';'
-BadBinaryLiterals.java:17:30: compiler.err.expected: token.identifier
-5 errors
--- a/test/langtools/tools/javac/literals/BadBinaryLiterals.7.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/literals/BadBinaryLiterals.7.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,7 +1,7 @@
-BadBinaryLiterals.java:11:24: compiler.err.expected: ';'
-BadBinaryLiterals.java:13:21: compiler.err.int.number.too.large: 111111111111111111111111111111111
-BadBinaryLiterals.java:15:21: compiler.err.int.number.too.large: 11111111111111111111111111111111111111111111111111111111111111111
+BadBinaryLiterals.java:10:24: compiler.err.expected: ';'
+BadBinaryLiterals.java:12:21: compiler.err.int.number.too.large: 111111111111111111111111111111111
+BadBinaryLiterals.java:14:21: compiler.err.int.number.too.large: 11111111111111111111111111111111111111111111111111111111111111111
+BadBinaryLiterals.java:15:27: compiler.err.expected: ';'
 BadBinaryLiterals.java:16:27: compiler.err.expected: ';'
-BadBinaryLiterals.java:17:27: compiler.err.expected: ';'
-BadBinaryLiterals.java:17:30: compiler.err.expected: token.identifier
+BadBinaryLiterals.java:16:30: compiler.err.expected: token.identifier
 6 errors
--- a/test/langtools/tools/javac/literals/BadBinaryLiterals.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/literals/BadBinaryLiterals.java	Fri Jul 06 10:28:56 2018 -0700
@@ -2,7 +2,6 @@
  * @test /nodynamiccopyright/
  * @bug 6860965
  * @summary Project Coin: binary literals
- * @compile/fail/ref=BadBinaryLiterals.6.out -XDrawDiagnostics -source 6 -Xlint:-options BadBinaryLiterals.java
  * @compile/fail/ref=BadBinaryLiterals.7.out -XDrawDiagnostics BadBinaryLiterals.java
  */
 
--- a/test/langtools/tools/javac/literals/BadUnderscoreLiterals.6.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-BadUnderscoreLiterals.java:11:17: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.underscore.lit), 6, 7
-BadUnderscoreLiterals.java:15:15: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:19:19: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:22:14: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.binary.lit), 6, 7
-BadUnderscoreLiterals.java:22:16: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:23:17: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:26:16: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:27:17: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:30:17: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:31:18: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:32:19: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:33:19: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:34:18: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:35:19: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:38:19: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:39:20: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:40:21: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:41:22: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:42:21: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:43:22: compiler.err.illegal.underscore
-20 errors
--- a/test/langtools/tools/javac/literals/BadUnderscoreLiterals.7.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/literals/BadUnderscoreLiterals.7.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,19 +1,19 @@
-BadUnderscoreLiterals.java:15:15: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:19:19: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:22:16: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:23:17: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:26:16: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:27:17: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:30:17: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:31:18: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:14:15: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:18:19: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:21:16: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:22:17: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:25:16: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:26:17: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:29:17: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:30:18: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:31:19: compiler.err.illegal.underscore
 BadUnderscoreLiterals.java:32:19: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:33:19: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:34:18: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:35:19: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:38:19: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:39:20: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:40:21: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:41:22: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:42:21: compiler.err.illegal.underscore
-BadUnderscoreLiterals.java:43:22: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:33:18: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:34:19: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:37:19: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:38:20: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:39:21: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:40:22: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:41:21: compiler.err.illegal.underscore
+BadUnderscoreLiterals.java:42:22: compiler.err.illegal.underscore
 18 errors
--- a/test/langtools/tools/javac/literals/BadUnderscoreLiterals.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/literals/BadUnderscoreLiterals.java	Fri Jul 06 10:28:56 2018 -0700
@@ -4,11 +4,10 @@
  * @summary Project Coin: underscores in literals
  *
  * @compile/fail/ref=BadUnderscoreLiterals.7.out -XDrawDiagnostics BadUnderscoreLiterals.java
- * @compile/fail/ref=BadUnderscoreLiterals.6.out -XDrawDiagnostics -source 6 -Xlint:-options BadUnderscoreLiterals.java
  */
 
 public class BadUnderscoreLiterals {
-    int valid = 1_1;            // valid literal; illegal in -source 6
+    int valid = 1_1;            // valid literal
 
     // test zero
     int z1 = _0;                // valid (but undefined) variable
--- a/test/langtools/tools/javac/mixedTarget/ExtendCovariant2.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/mixedTarget/ExtendCovariant2.java	Fri Jul 06 10:28:56 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @summary Ensure Covariant Return Type allowed in minimum supported version
  * @author gafter
  *
- * @compile -source 1.6 ExtendCovariant2.java
  * @compile                  ExtendCovariant2.java
  */
 
@@ -40,7 +39,7 @@
  *
  * With JDK 1.5, a Covariant Return is allowed so check that is the case.
  *
- **/
+ */
 public class ExtendCovariant2 extends java.io.PrintStream {
     ExtendCovariant2() throws java.io.IOException {
         super("");
--- a/test/langtools/tools/javac/multicatch/Neg01.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/multicatch/Neg01.java	Fri Jul 06 10:28:56 2018 -0700
@@ -5,8 +5,6 @@
  * @summary Project Coin: Improved Exception Handling for Java (aka 'multicatch')
  * @author darcy
  * @compile/fail/ref=Neg01.out -XDrawDiagnostics Neg01.java
- * @compile -source 6 -XDrawDiagnostics Neg01.java
- *
  */
 
 class Neg01 {
--- a/test/langtools/tools/javac/multicatch/Neg01.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/multicatch/Neg01.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-Neg01.java:24:19: compiler.err.except.never.thrown.in.try: Neg01.B2
+Neg01.java:22:19: compiler.err.except.never.thrown.in.try: Neg01.B2
 1 error
--- a/test/langtools/tools/javac/multicatch/Neg01eff_final.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/multicatch/Neg01eff_final.java	Fri Jul 06 10:28:56 2018 -0700
@@ -5,8 +5,6 @@
  * @summary Project Coin: Improved Exception Handling for Java (aka 'multicatch')
  * @author darcy
  * @compile/fail/ref=Neg01eff_final.out -XDrawDiagnostics Neg01eff_final.java
- * @compile -source 6 -XDrawDiagnostics Neg01eff_final.java
- *
  */
 
 class Neg01eff_final {
--- a/test/langtools/tools/javac/multicatch/Neg01eff_final.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/multicatch/Neg01eff_final.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-Neg01eff_final.java:24:19: compiler.err.except.never.thrown.in.try: Neg01eff_final.B2
+Neg01eff_final.java:22:19: compiler.err.except.never.thrown.in.try: Neg01eff_final.B2
 1 error
--- a/test/langtools/tools/javac/processing/warnings/TestSourceVersionWarnings.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/processing/warnings/TestSourceVersionWarnings.java	Fri Jul 06 10:28:56 2018 -0700
@@ -29,13 +29,12 @@
  * @modules java.compiler
  *          jdk.compiler
  * @compile TestSourceVersionWarnings.java
- * @compile/ref=gold_0.out             -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only                           -source 1.6 -Xlint:-options HelloWorld.java
- * @compile/ref=gold_sv_warn_5_6.out   -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_5 -source 1.6 -Xlint:-options HelloWorld.java
- * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_6 -source 1.6 -Xlint:-options HelloWorld.java
- * @compile/ref=gold_unsp_warn.out     -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_6 -source 1.6 -Xlint:-options -Aunsupported HelloWorld.java
- * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_7 -source 1.7 -Xlint:-options HelloWorld.java
- * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_8 -source 1.8 -Xlint:-options HelloWorld.java
- * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_9 -source 1.9 -Xlint:-options HelloWorld.java
+ * @compile/ref=gold_0.out             -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only                            -source  8 -Xlint:-options HelloWorld.java
+ * @compile/ref=gold_sv_warn_5_6.out   -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_5  -source  8 -Xlint:-options HelloWorld.java
+ * @compile/ref=gold_unsp_warn.out     -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_8  -source  8 -Xlint:-options -Aunsupported HelloWorld.java
+ * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_10 -source 10 -Xlint:-options HelloWorld.java
+ * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_11 -source 11 -Xlint:-options HelloWorld.java
+ * @compile/ref=gold_sv_none.out       -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_12 -source 12 -Xlint:-options HelloWorld.java
  */
 
 import java.util.Set;
@@ -64,7 +63,7 @@
         if (sourceVersion == null) {
             processingEnv.getMessager().printMessage(WARNING,
                                                      "No SourceVersion option given");
-            return SourceVersion.RELEASE_6;
+            return SourceVersion.RELEASE_8;
         } else {
             return SourceVersion.valueOf(sourceVersion);
         }
--- a/test/langtools/tools/javac/processing/warnings/gold_sv_warn_5_6.out	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/processing/warnings/gold_sv_warn_5_6.out	Fri Jul 06 10:28:56 2018 -0700
@@ -1,2 +1,2 @@
-- compiler.warn.proc.processor.incompatible.source.version: RELEASE_5, TestSourceVersionWarnings, 6
+- compiler.warn.proc.processor.incompatible.source.version: RELEASE_5, TestSourceVersionWarnings, 8
 1 warning
--- a/test/langtools/tools/javac/types/CastObjectToPrimitiveTest.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/types/CastObjectToPrimitiveTest.java	Fri Jul 06 10:28:56 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @bug 7038363
  * @summary cast from object to primitive should be for source >= 1.7
- * @compile/fail/ref=CastObjectToPrimitiveTest.out -XDrawDiagnostics -Xlint:-options -source 6 CastObjectToPrimitiveTest.java
  * @compile CastObjectToPrimitiveTest.java
  */
 
--- a/test/langtools/tools/javac/types/CastObjectToPrimitiveTest.out	Fri Jul 06 09:37:44 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-CastObjectToPrimitiveTest.java:35:23: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Object, int)
-1 error
--- a/test/langtools/tools/javac/versions/Versions.java	Fri Jul 06 09:37:44 2018 -0700
+++ b/test/langtools/tools/javac/versions/Versions.java	Fri Jul 06 10:28:56 2018 -0700
@@ -66,15 +66,14 @@
     }
 
     public static final Set<String> RETIRED_SOURCES =
-        Set.of("1.2", "1.3", "1.4", "1.5");
+        Set.of("1.2", "1.3", "1.4", "1.5" /*, 1.6 */);
 
     public static final Set<String> VALID_SOURCES =
-        Set.of("1.6", "1.7", "1.8", "1.9", "1.10", "11", "12");
+        Set.of("1.7", "1.8", "1.9", "1.10", "11", "12");
 
     public static final String LATEST_MAJOR_VERSION = "56.0";
 
     static enum SourceTarget {
-        SIX(true,     "50.0",  "6", Versions::checksrc16),
         SEVEN(true,   "51.0",  "7", Versions::checksrc17),
         EIGHT(true,   "52.0",  "8", Versions::checksrc18),
         NINE(true,    "53.0",  "9", Versions::checksrc19),
@@ -232,17 +231,6 @@
         }
     }
 
-    protected void checksrc16(String... args) {
-        printargs("checksrc16", args);
-        int asize = args.length;
-        String[] newargs = new String[asize + 1];
-        System.arraycopy(args, 0, newargs, 0, asize);
-        newargs[asize] = "Base.java";
-        pass(newargs);
-        newargs[asize] = "New17.java";
-        fail(newargs);
-    }
-
     protected void checksrc17(String... args) {
         printargs("checksrc17", args);
         int asize = args.length;