stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8198314: javac hidden options violate standard syntax for options

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Vicente Romero 2018-04-03 23:58:52 -04:00
parent 3a3fbb391f
commit 6a2e0a5a01
74 changed files with 146 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
View File

@ -520,24 +520,24 @@ public enum Option {
XDIAGS("-Xdiags:", "opt.diags", EXTENDED, BASIC, ONEOF, "compact", "verbose"),
DEBUG("--debug:", null, HIDDEN, BASIC) {
DEBUG("--debug", null, HIDDEN, BASIC, ArgKind.REQUIRED) {
@Override
public void process(OptionHelper helper, String option) throws InvalidValueException {
HiddenGroup.DEBUG.process(helper, option);
public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
HiddenGroup.DEBUG.process(helper, option, arg);
}
},
SHOULDSTOP("--should-stop:", null, HIDDEN, BASIC) {
SHOULDSTOP("--should-stop", null, HIDDEN, BASIC, ArgKind.REQUIRED) {
@Override
public void process(OptionHelper helper, String option) throws InvalidValueException {
HiddenGroup.SHOULDSTOP.process(helper, option);
public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
HiddenGroup.SHOULDSTOP.process(helper, option, arg);
}
},
DIAGS("--diags:", null, HIDDEN, BASIC) {
DIAGS("--diags", null, HIDDEN, BASIC, ArgKind.REQUIRED) {
@Override
public void process(OptionHelper helper, String option) throws InvalidValueException {
HiddenGroup.DIAGS.process(helper, option);
public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
HiddenGroup.DIAGS.process(helper, option, arg);
}
},
@ -846,27 +846,19 @@ public enum Option {
DEBUG("debug"),
SHOULDSTOP("should-stop");
static final Set<String> skipSet = new java.util.HashSet<>(
Arrays.asList("--diags:", "--debug:", "--should-stop:"));
final String text;
HiddenGroup(String text) {
this.text = text;
}
public void process(OptionHelper helper, String option) throws InvalidValueException {
String p = option.substring(option.indexOf(':') + 1).trim();
String[] subOptions = p.split(";");
public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
String[] subOptions = arg.split(";");
for (String subOption : subOptions) {
subOption = text + "." + subOption.trim();
XD.process(helper, subOption, subOption);
}
}
static boolean skip(String name) {
return skipSet.contains(name);
}
}
/**
@ -957,6 +949,11 @@ public enum Option {
this(text, null, descrKey, kind, group, null, null, ArgKind.NONE);
}
Option(String text, String descrKey,
OptionKind kind, OptionGroup group, ArgKind argKind) {
this(text, null, descrKey, kind, group, null, null, argKind);
}
Option(String text, String argsNameKey, String descrKey,
OptionKind kind, OptionGroup group) {
this(text, argsNameKey, descrKey, kind, group, null, null, ArgKind.REQUIRED);
@ -1025,7 +1022,7 @@ public enum Option {
}
private boolean matches(String option, String name) {
if (name.startsWith("--") && !HiddenGroup.skip(name)) {
if (name.startsWith("--")) {
return option.equals(name)
|| hasArg() && option.startsWith(name + "=");
}

4
src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 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
@ -313,7 +313,7 @@ public class Options {
}
// Enable dependency generation
args.add("--debug:completionDeps=source,class");
args.add("--debug=completionDeps=source,class");
// This can't be anything but 'none'. Enforced by sjavac main method.
args.add("-implicit:" + implicitPolicy);

2
src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
View File

@ -167,7 +167,7 @@ class TaskFactory {
WrapSourceHandler sh = new WrapSourceHandler();
List<String> allOptions = new ArrayList<>();
allOptions.add("--should-stop:at=FLOW");
allOptions.add("--should-stop=at=FLOW");
allOptions.add("-Xlint:unchecked");
allOptions.add("-proc:none");
allOptions.addAll(extraArgs);

4
test/langtools/tools/javac/ClassFileModifiers/ClassModifiers.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 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
@ -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 --debug:dumpmodifiers=ci ClassModifiers.java
* @compile/ref=ClassModifiers.out --debug=dumpmodifiers=ci ClassModifiers.java
*
*/

4
test/langtools/tools/javac/ClassFileModifiers/MemberModifiers.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 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
@ -26,7 +26,7 @@
* @bug 4249112 4785453
* @summary Verify that implicit member modifiers are set correctly.
*
* @compile/ref=MemberModifiers.out --debug:dumpmodifiers=cfm MemberModifiers.java
* @compile/ref=MemberModifiers.out --debug=dumpmodifiers=cfm MemberModifiers.java
*/
// Currently, we check only that members of final classes are not final.

4
test/langtools/tools/javac/Diagnostics/6722234/T6722234a.java
View File

@ -3,8 +3,8 @@
* @bug 6722234
* @summary javac diagnostics need better integration with the type-system
* @author mcimadamore
* @compile/fail/ref=T6722234a_1.out -XDrawDiagnostics --diags:formatterOptions=disambiguateTvars T6722234a.java
* @compile/fail/ref=T6722234a_2.out -XDrawDiagnostics --diags:formatterOptions=disambiguateTvars,where T6722234a.java
* @compile/fail/ref=T6722234a_1.out -XDrawDiagnostics --diags=formatterOptions=disambiguateTvars T6722234a.java
* @compile/fail/ref=T6722234a_2.out -XDrawDiagnostics --diags=formatterOptions=disambiguateTvars,where T6722234a.java
*/
class T6722234a<T extends String> {

4
test/langtools/tools/javac/Diagnostics/6722234/T6722234b.java
View File

@ -3,8 +3,8 @@
* @bug 6722234 8078024
* @summary javac diagnostics need better integration with the type-system
* @author mcimadamore
* @compile/fail/ref=T6722234b_1.out -XDrawDiagnostics --diags:formatterOptions=simpleNames T6722234b.java
* @compile/fail/ref=T6722234b_2.out -XDrawDiagnostics --diags:formatterOptions=simpleNames,where T6722234b.java
* @compile/fail/ref=T6722234b_1.out -XDrawDiagnostics --diags=formatterOptions=simpleNames T6722234b.java
* @compile/fail/ref=T6722234b_2.out -XDrawDiagnostics --diags=formatterOptions=simpleNames,where T6722234b.java
*/
import java.util.*;

2
test/langtools/tools/javac/Diagnostics/6722234/T6722234c.java
View File

@ -3,7 +3,7 @@
* @bug 6722234
* @summary javac diagnostics need better integration with the type-system
* @author mcimadamore
* @compile/fail/ref=T6722234c.out -XDrawDiagnostics --diags:formatterOptions=simpleNames T6722234c.java
* @compile/fail/ref=T6722234c.out -XDrawDiagnostics --diags=formatterOptions=simpleNames T6722234c.java
*/
class T6722234c {

4
test/langtools/tools/javac/Diagnostics/6722234/T6722234d.java
View File

@ -3,8 +3,8 @@
* @bug 6722234 8078024
* @summary javac diagnostics need better integration with the type-system
* @author mcimadamore
* @compile/fail/ref=T6722234d_1.out -XDrawDiagnostics --diags:formatterOptions=where T6722234d.java
* @compile/fail/ref=T6722234d_2.out -XDrawDiagnostics --diags:formatterOptions=where,simpleNames T6722234d.java
* @compile/fail/ref=T6722234d_1.out -XDrawDiagnostics --diags=formatterOptions=where T6722234d.java
* @compile/fail/ref=T6722234d_2.out -XDrawDiagnostics --diags=formatterOptions=where,simpleNames T6722234d.java
*/
class T6722234d {

2
test/langtools/tools/javac/Diagnostics/6862608/T6862608a.java
View File

@ -3,7 +3,7 @@
* @bug 6862608
* @summary rich diagnostic sometimes contain wrong type variable numbering
* @author mcimadamore
* @compile/fail/ref=T6862608a.out -XDrawDiagnostics --diags:formatterOptions=disambiguateTvars,where T6862608a.java
* @compile/fail/ref=T6862608a.out -XDrawDiagnostics --diags=formatterOptions=disambiguateTvars,where T6862608a.java
*/

2
test/langtools/tools/javac/Diagnostics/6862608/T6862608b.java
View File

@ -3,7 +3,7 @@
* @bug 6862608
* @summary rich diagnostic sometimes contain wrong type variable numbering
* @author mcimadamore
* @compile/fail/ref=T6862608b.out -XDrawDiagnostics --diags:formatterOptions=disambiguateTvars,where T6862608b.java
* @compile/fail/ref=T6862608b.out -XDrawDiagnostics --diags=formatterOptions=disambiguateTvars,where T6862608b.java
*/
class T66862608b<T extends String, S> {

6
test/langtools/tools/javac/Diagnostics/7010608/Test.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2016, 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
@ -46,9 +46,9 @@ public class Test {
try {
test(Arrays.<String>asList(),
"myfo://test:1: error: cannot find symbol");
test(Arrays.asList("--diags:layout=OLD"),
test(Arrays.asList("--diags=layout=OLD"),
"myfo://test:1: cannot find symbol");
test(Arrays.asList("--diags:legacy"),
test(Arrays.asList("--diags=legacy"),
"myfo://test:1: cannot find symbol");
} finally {
Locale.setDefault(prev);

2
test/langtools/tools/javac/Diagnostics/8010387/T8010387.java
View File

@ -2,7 +2,7 @@
* @test /nodynamiccopyright/
* @bug 8010387
* @summary rich diagnostic sometimes contain wrong type variable numbering
* @compile/fail/ref=T8010387.out -XDrawDiagnostics --diags:formatterOptions=disambiguateTvars,where T8010387.java
* @compile/fail/ref=T8010387.out -XDrawDiagnostics --diags=formatterOptions=disambiguateTvars,where T8010387.java
*/
abstract class T8010387<X> {

2
test/langtools/tools/javac/InterfaceMemberClassModifiers.java
View File

@ -4,7 +4,7 @@
* @summary Verify that invalid access modifiers on interface members don't cause crash.
* @author maddox
*
* @compile/fail/ref=InterfaceMemberClassModifiers.out --diags:layout=%b:%l:%_%m InterfaceMemberClassModifiers.java
* @compile/fail/ref=InterfaceMemberClassModifiers.out --diags=layout=%b:%l:%_%m InterfaceMemberClassModifiers.java
*/
public interface InterfaceMemberClassModifiers {

4
test/langtools/tools/javac/T6214885.java
View File

@ -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 --diags:layout=%b:%l%_%t%m|%p%m T6214885.java
* @compile/fail/ref=T6214885b.out --diags:layout=%b:%l:%c%_%t%m|%p%m T6214885.java
* @compile/fail/ref=T6214885a.out --diags=layout=%b:%l%_%t%m|%p%m T6214885.java
* @compile/fail/ref=T6214885b.out --diags=layout=%b:%l:%c%_%t%m|%p%m T6214885.java
*/
class T6214885
{

2
test/langtools/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java
View File

@ -2,7 +2,7 @@
* @test /nodynamiccopyright/
* @bug 8026963
* @summary type annotations code crashes for lambdas with void argument
* @compile/fail/ref=TypeAnnotationsCrashWithErroneousTreeTest.out -XDrawDiagnostics --should-stop:at=FLOW TypeAnnotationsCrashWithErroneousTreeTest.java
* @compile/fail/ref=TypeAnnotationsCrashWithErroneousTreeTest.out -XDrawDiagnostics --should-stop=at=FLOW TypeAnnotationsCrashWithErroneousTreeTest.java
*/
public class TypeAnnotationsCrashWithErroneousTreeTest {

4
test/langtools/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 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
@ -237,7 +237,7 @@ public class VerifyErroneousAnnotationsAttributed {
JavacTask task = tool.getTask(null,
fm,
devNull,
Arrays.asList("--should-stop:at=FLOW"),
Arrays.asList("--should-stop=at=FLOW"),
null,
Arrays.asList(new MyFileObject(code)));

4
test/langtools/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 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
@ -54,7 +54,7 @@ public class AfterMethodTypeParams {
String test = TEMPLATE.replace("CONTENT", tc.snippet);
List<JavaFileObject> files = Arrays.asList(new MyFileObject(test));
StringWriter out = new StringWriter();
List<String> options = Arrays.asList("-XDrawDiagnostics", "--should-stop:at=FLOW");
List<String> options = Arrays.asList("-XDrawDiagnostics", "--should-stop=at=FLOW");
JavacTask task = (JavacTask) compiler.getTask(out, null, null, options, null, files);
new TreePathScanner<Void, Void>() {

6
test/langtools/tools/javac/api/6731573/T6731573.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 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
@ -62,8 +62,8 @@ public class T6731573 extends ToolTester {
enum SourceLine {
STANDARD(null),
ENABLED("--diags:showSource=true"),
DISABLED("--diags:showSource=false");
ENABLED("--diags=showSource=true"),
DISABLED("--diags=showSource=false");
String optValue;

10
test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 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
@ -63,11 +63,11 @@ public class EventsBalancedTest {
test(null, Arrays.asList(b, a));
for (CompileState stop : CompileState.values()) {
test(Arrays.asList("--should-stop:ifNoError=" + stop,
"--should-stop:ifError=" + stop),
test(Arrays.asList("--should-stop=ifNoError=" + stop,
"--should-stop=ifError=" + stop),
Arrays.asList(a, b));
test(Arrays.asList("--should-stop:ifNoError=" + stop,
"--should-stop:ifError=" + stop),
test(Arrays.asList("--should-stop=ifNoError=" + stop,
"--should-stop=ifError=" + stop),
Arrays.asList(b, a));
}
}

4
test/langtools/tools/javac/completionDeps/DepsAndAnno.java
View File

@ -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
@ -47,7 +47,7 @@ public class DepsAndAnno {
public static void main(String[] args) {
ToolBox toolBox = new ToolBox();
new JavacTask(toolBox, Task.Mode.CMDLINE)
.options("--debug:completionDeps")
.options("--debug=completionDeps")
.outdir(".")
.files(ToolBox.testSrc + "/DepsAndAnno.java")
.run();

4
test/langtools/tools/javac/completionDeps/DepsAndDocLint.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2017, 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,7 +25,7 @@
* @test
* @bug 8078389
* @summary Make sure there is no interference between completionDeps and doclint
* @compile --debug:completionDeps -Xdoclint DepsAndDocLint.java
* @compile --debug=completionDeps -Xdoclint DepsAndDocLint.java
*/
public class DepsAndDocLint {

4
test/langtools/tools/javac/diags/examples/ApplicableMethodFound.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2016, 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
@ -23,7 +23,7 @@
// key: compiler.misc.applicable.method.found
// key: compiler.note.verbose.resolve.multi
// options: --debug:verboseResolution=applicable,success
// options: --debug=verboseResolution=applicable,success
class ApplicableMethodFound {

4
test/langtools/tools/javac/diags/examples/ApplicableMethodFound1.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2016, 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
@ -24,7 +24,7 @@
// key: compiler.misc.applicable.method.found.1
// key: compiler.note.verbose.resolve.multi
// key: compiler.misc.partial.inst.sig
// options: --debug:verboseResolution=applicable,success
// options: --debug=verboseResolution=applicable,success
class ApplicableMethodFound1 {

4
test/langtools/tools/javac/diags/examples/DeferredMethodInst.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2016, 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,7 @@
// key: compiler.note.verbose.resolve.multi
// key: compiler.note.deferred.method.inst
// key: compiler.misc.partial.inst.sig
// options: --debug:verboseResolution=applicable,success,deferred-inference
// options: --debug=verboseResolution=applicable,success,deferred-inference
class DeferredMethodInst {

2
test/langtools/tools/javac/diags/examples/LambdaDeduplicate.java
View File

@ -23,7 +23,7 @@
// key: compiler.note.verbose.l2m.deduplicate
// options: --debug:dumpLambdaToMethodDeduplication
// options: --debug=dumpLambdaToMethodDeduplication
import java.util.function.Function;

4
test/langtools/tools/javac/diags/examples/LambdaStat.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 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
@ -22,7 +22,7 @@
*/
// key: compiler.note.lambda.stat
// options: --debug:dumpLambdaToMethodStats
// options: --debug=dumpLambdaToMethodStats
class LambdaStat {
Runnable r = ()->{};

4
test/langtools/tools/javac/diags/examples/MrefStat.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 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
@ -22,7 +22,7 @@
*/
// key: compiler.note.mref.stat
// options: --debug:dumpLambdaToMethodStats
// options: --debug=dumpLambdaToMethodStats
class MrefStat {
Runnable r = MrefStat::m;

4
test/langtools/tools/javac/diags/examples/MrefStat1.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 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
@ -22,7 +22,7 @@
*/
// key: compiler.note.mref.stat.1
// options: --debug:dumpLambdaToMethodStats
// options: --debug=dumpLambdaToMethodStats
class MrefStat1 {

4
test/langtools/tools/javac/diags/examples/NotApplicableMethodFound.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2016, 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
@ -26,7 +26,7 @@
// key: compiler.err.cant.apply.symbol
// key: compiler.misc.no.conforming.assignment.exists
// key: compiler.misc.inconvertible.types
// options: --debug:verboseResolution=inapplicable,failure
// options: --debug=verboseResolution=inapplicable,failure
class NotApplicableMethodFound {

4
test/langtools/tools/javac/diags/examples/PartialInstSig.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2016, 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
@ -24,7 +24,7 @@
// key: compiler.misc.applicable.method.found.1
// key: compiler.note.verbose.resolve.multi
// key: compiler.misc.partial.inst.sig
// options: --debug:verboseResolution=applicable,success
// options: --debug=verboseResolution=applicable,success
class PartialInstSig {

4
test/langtools/tools/javac/diags/examples/VerboseResolveMulti.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2016, 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
@ -23,7 +23,7 @@
// key: compiler.misc.applicable.method.found
// key: compiler.note.verbose.resolve.multi
// options: --debug:verboseResolution=applicable,success
// options: --debug=verboseResolution=applicable,success
class VerboseResolveMulti {

4
test/langtools/tools/javac/diags/examples/VerboseResolveMulti1.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2016, 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
@ -26,7 +26,7 @@
// key: compiler.err.cant.apply.symbol
// key: compiler.misc.no.conforming.assignment.exists
// key: compiler.misc.inconvertible.types
// options: --debug:verboseResolution=inapplicable,failure
// options: --debug=verboseResolution=inapplicable,failure
class VerboseResolveMulti1 {

4
test/langtools/tools/javac/diags/examples/WhereCaptured.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 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
@ -28,7 +28,7 @@
// key: compiler.err.cant.apply.symbol
// key: compiler.misc.incompatible.eq.bounds
// key: compiler.misc.captured.type
// options: --diags:formatterOptions=where,simpleNames
// options: --diags=formatterOptions=where,simpleNames
// run: simple
import java.util.*;

4
test/langtools/tools/javac/diags/examples/WhereCaptured1.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 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
@ -29,7 +29,7 @@
// key: compiler.misc.incompatible.eq.bounds
// key: compiler.misc.captured.type
// key: compiler.misc.type.null
// options: --diags:formatterOptions=where,simpleNames
// options: --diags=formatterOptions=where,simpleNames
// run: simple
import java.util.*;

4
test/langtools/tools/javac/diags/examples/WhereFreshTvar.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 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,7 @@
// key: compiler.misc.where.description.typevar
// key: compiler.err.prob.found.req
// key: compiler.misc.inconvertible.types
// options: --diags:formatterOptions=where,simpleNames
// options: --diags=formatterOptions=where,simpleNames
// run: simple
import java.util.*;

4
test/langtools/tools/javac/diags/examples/WhereIntersection.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 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
@ -26,7 +26,7 @@
// key: compiler.misc.where.description.intersection.1
// key: compiler.misc.where.intersection
// key: compiler.err.prob.found.req
// options: --diags:formatterOptions=where
// options: --diags=formatterOptions=where
// run: simple
class WhereIntersection {

4
test/langtools/tools/javac/diags/examples/WhereIntersection2.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 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
@ -29,7 +29,7 @@
// key: compiler.misc.where.description.intersection
// key: compiler.misc.where.intersection
// key: compiler.err.prob.found.req
// options: --diags:formatterOptions=where
// options: --diags=formatterOptions=where
// run: simple
class WhereIntersection2 {

4
test/langtools/tools/javac/diags/examples/WhereTypeVar.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 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,7 @@
// key: compiler.err.cant.apply.symbol
// key: compiler.misc.no.conforming.assignment.exists
// key: compiler.misc.inconvertible.types
// options: --diags:formatterOptions=where,disambiguateTvars
// options: --diags=formatterOptions=where,disambiguateTvars
// run: simple
class WhereTypeVar<T extends String> {

4
test/langtools/tools/javac/diags/examples/WhereTypeVar2.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 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,7 @@
// key: compiler.misc.where.description.typevar
// key: compiler.misc.where.typevar
// key: compiler.err.prob.found.req
// options: --diags:formatterOptions=where
// options: --diags=formatterOptions=where
// run: simple
class WhereTypeVar2 {

4
test/langtools/tools/javac/failover/CheckAttributedTree.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 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
@ -315,7 +315,7 @@ public class CheckAttributedTree {
totalNumberOfCompilations++;
newCompilationTask()
.withWriter(pw)
.withOption("--should-stop:at=ATTR")
.withOption("--should-stop=at=ATTR")
.withOption("-XDverboseCompilePolicy")
.withOption("-Xdoclint:none")
.withSource(files.iterator().next())

2
test/langtools/tools/javac/failover/FailOver01.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver01.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver01.java
* @compile/fail/ref=FailOver01.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver01.java
*/
class Test { { x = "" } }

2
test/langtools/tools/javac/failover/FailOver02.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver02.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver02.java
* @compile/fail/ref=FailOver02.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver02.java
*/
class Test implements AutoCloseable {

2
test/langtools/tools/javac/failover/FailOver03.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver03.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver03.java
* @compile/fail/ref=FailOver03.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver03.java
*/
class Test extends Test {

2
test/langtools/tools/javac/failover/FailOver04.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver04.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver04.java
* @compile/fail/ref=FailOver04.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver04.java
*/
class Test {

2
test/langtools/tools/javac/failover/FailOver05.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver05.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver05.java
* @compile/fail/ref=FailOver05.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver05.java
*/
class Test extends Test {

2
test/langtools/tools/javac/failover/FailOver06.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver06.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver06.java
* @compile/fail/ref=FailOver06.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver06.java
*/
class Test extends Test {

2
test/langtools/tools/javac/failover/FailOver07.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver07.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver07.java
* @compile/fail/ref=FailOver07.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver07.java
*/
class Test extends Test {

2
test/langtools/tools/javac/failover/FailOver08.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver08.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver08.java
* @compile/fail/ref=FailOver08.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver08.java
*/
class Test extends Test {

2
test/langtools/tools/javac/failover/FailOver09.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver09.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver09.java
* @compile/fail/ref=FailOver09.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver09.java
*/
class Test extends Test {

2
test/langtools/tools/javac/failover/FailOver10.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver10.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver10.java
* @compile/fail/ref=FailOver10.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver10.java
*/
class Test extends Test {

2
test/langtools/tools/javac/failover/FailOver11.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver11.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver11.java
* @compile/fail/ref=FailOver11.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver11.java
*/
class Test extends Test {

2
test/langtools/tools/javac/failover/FailOver12.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver12.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver12.java
* @compile/fail/ref=FailOver12.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver12.java
*/
class Test extends Test {

2
test/langtools/tools/javac/failover/FailOver13.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver13.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver13.java
* @compile/fail/ref=FailOver13.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver13.java
*/
class Test extends Test {

2
test/langtools/tools/javac/failover/FailOver14.java
View File

@ -4,7 +4,7 @@
* @summary Flow.java should be more error-friendly
* @author mcimadamore
*
* @compile/fail/ref=FailOver14.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver14.java
* @compile/fail/ref=FailOver14.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver14.java
*/
class Test extends Test {

2
test/langtools/tools/javac/failover/FailOver15.java
View File

@ -3,7 +3,7 @@
* @bug 6970584 7060926
* @summary Attr.PostAttrAnalyzer misses a case
*
* @compile/fail/ref=FailOver15.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver15.java
* @compile/fail/ref=FailOver15.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver15.java
*/
class Test {

4
test/langtools/tools/javac/generics/inference/8158355/T8158355.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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,7 @@
* @test
* @bug 8158355
* @summary Inference graph dot support broken
* @compile --debug:dumpInferenceGraphsTo=. T8158355.java
* @compile --debug=dumpInferenceGraphsTo=. T8158355.java
*/
import java.util.List;

2
test/langtools/tools/javac/lambda/MostSpecific09.java
View File

@ -2,7 +2,7 @@
* @test /nodynamiccopyright/
* @bug 8029718 8065800
* @summary Should always use lambda body structure to disambiguate overload resolution
* @compile/fail/ref=MostSpecific09.out -XDrawDiagnostics --should-stop:at=ATTR --debug:verboseResolution=applicable,success MostSpecific09.java
* @compile/fail/ref=MostSpecific09.out -XDrawDiagnostics --should-stop=at=ATTR --debug=verboseResolution=applicable,success MostSpecific09.java
*/
class MostSpecific09 {

4
test/langtools/tools/javac/lambda/TestLambdaToMethodStats.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 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
@ -122,7 +122,7 @@ public class TestLambdaToMethodStats extends ComboInstance<TestLambdaToMethodSta
@Override
public void doWork() throws IOException {
newCompilationTask()
.withOption("--debug:dumpLambdaToMethodStats")
.withOption("--debug=dumpLambdaToMethodStats")
.withSourceFromTemplate(template)
.generate(this::check);
}

4
test/langtools/tools/javac/lambda/XDdumpLambdaToMethodStats.java
View File

@ -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
@ -25,7 +25,7 @@
* @test
* @bug 8143217
* @summary javac throws NPE when printing diagnostics for Lambda expressions
* @compile XDdumpLambdaToMethodStats.java --debug:dumpLambdaToMethodStats
* @compile XDdumpLambdaToMethodStats.java --debug=dumpLambdaToMethodStats
*
*/

4
test/langtools/tools/javac/lambda/bridge/TestMetafactoryBridges.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 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
@ -274,7 +274,7 @@ public class TestMetafactoryBridges {
sourcefiles.add(new JavaSource(ck));
}
JavacTask ct = (JavacTask)tool.getTask(debugWriter, null, diagChecker,
Arrays.asList("--debug:dumpLambdaToMethodStats", "-d", outDir.getAbsolutePath(),
Arrays.asList("--debug=dumpLambdaToMethodStats", "-d", outDir.getAbsolutePath(),
"-sourcepath", srcDir.getAbsolutePath(),
"-classpath", classesDir.getAbsolutePath(),
pp.preferOpt), null, sourcefiles);

4
test/langtools/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 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
@ -210,7 +210,7 @@ public class StructuralMostSpecificTest extends ComboInstance<StructuralMostSpec
public void doWork() throws Throwable {
newCompilationTask()
.withSourceFromTemplate(sourceTemplate)
.withOption("--debug:verboseResolution=all,-predef,-internal,-object-init")
.withOption("--debug=verboseResolution=all,-predef,-internal,-object-init")
.analyze(this::check);
}

2
test/langtools/tools/javac/missingSuperRecovery/MissingSuperRecovery.java
View File

@ -5,7 +5,7 @@
* class is no longer available during a subsequent compilation.
* @author maddox
* @build impl
* @compile/fail/ref=MissingSuperRecovery.out --diags:layout=%b:%l:%_%m MissingSuperRecovery.java
* @compile/fail/ref=MissingSuperRecovery.out --diags=layout=%b:%l:%_%m MissingSuperRecovery.java
*/
// Requires "golden" class file 'impl.class', which contains

14
test/langtools/tools/javac/modules/AddLimitMods.java
View File

@ -120,7 +120,7 @@ public class AddLimitMods extends ModuleTestBase {
//real test
new JavacTask(tb)
.options("--module-path", modulePath.toString(),
"--should-stop:ifNoError=FLOW",
"--should-stop=ifNoError=FLOW",
"--limit-modules", "java.base")
.outdir(modulePath)
.files(findJavaFiles(m1))
@ -129,7 +129,7 @@ public class AddLimitMods extends ModuleTestBase {
new JavacTask(tb)
.options("--module-path", modulePath.toString(),
"--should-stop:ifNoError=FLOW",
"--should-stop=ifNoError=FLOW",
"--limit-modules", "java.base",
"--add-modules", "m2x")
.outdir(modulePath)
@ -139,7 +139,7 @@ public class AddLimitMods extends ModuleTestBase {
new JavacTask(tb)
.options("--module-path", modulePath.toString(),
"--should-stop:ifNoError=FLOW",
"--should-stop=ifNoError=FLOW",
"--limit-modules", "java.base",
"--add-modules", "m2x,m3x")
.outdir(modulePath)
@ -149,7 +149,7 @@ public class AddLimitMods extends ModuleTestBase {
new JavacTask(tb)
.options("--module-path", modulePath.toString(),
"--should-stop:ifNoError=FLOW",
"--should-stop=ifNoError=FLOW",
"--limit-modules", "m2x")
.outdir(modulePath)
.files(findJavaFiles(m1))
@ -158,7 +158,7 @@ public class AddLimitMods extends ModuleTestBase {
new JavacTask(tb)
.options("--module-path", modulePath.toString(),
"--should-stop:ifNoError=FLOW",
"--should-stop=ifNoError=FLOW",
"--limit-modules", "m3x")
.outdir(modulePath)
.files(findJavaFiles(m1))
@ -167,7 +167,7 @@ public class AddLimitMods extends ModuleTestBase {
new JavacTask(tb)
.options("--module-path", modulePath.toString(),
"--should-stop:ifNoError=FLOW",
"--should-stop=ifNoError=FLOW",
"--limit-modules", "m3x",
"--add-modules", "m2x")
.outdir(modulePath)
@ -430,7 +430,7 @@ public class AddLimitMods extends ModuleTestBase {
auxOptions,
"--module-path", modulePath.toString(),
"--class-path", classpathOut.toString(),
"--should-stop:ifNoError=FLOW"))
"--should-stop=ifNoError=FLOW"))
.outdir(modulePath)
.files(findJavaFiles(m2))
.run(success ? Task.Expect.SUCCESS : Task.Expect.FAIL)

4
test/langtools/tools/javac/options/IsSupportedOptionTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 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
@ -52,7 +52,7 @@ public class IsSupportedOptionTest {
check(tool, "-Xdoclint", 0);
check(tool, "-Xdoclint:stats", 0);
check(tool, "-Xdoclint/package:foo", 0);
check(tool, "--debug:any", 0);
check(tool, "--debug=any", 1);
check(tool, "-g", 0);
check(tool, "-g:vars", 0);
check(tool, "-g:none", 0);

6
test/langtools/tools/javac/policy/test3/Test.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 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
@ -30,7 +30,7 @@
import java.io.*;
import java.util.*;
// Simple test of --should-stop:at.
// Simple test of --should-stop=at.
// For each of the permissable values, we compile a file with an error in it,
// then using -XDverboseCompilePolicy we check that the compilation gets as
// far as expected, but no further.
@ -83,7 +83,7 @@ public class Test {
args.add("-d");
args.add(".");
if (ssp.needOption)
args.add("--should-stop:at=" + ssp);
args.add("--should-stop=at=" + ssp);
args.add(new File(System.getProperty("test.src", "."), "A.java").getPath());
StringWriter sw = new StringWriter();

4
test/langtools/tools/javac/positions/TreeEndPosTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 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
@ -145,7 +145,7 @@ public class TreeEndPosTest {
options.add(tempDir.getPath());
options.add("-d");
options.add(tempDir.getPath());
options.add("--should-stop:at=GENERATE");
options.add("--should-stop=at=GENERATE");
List<JavaFileObject> sources = new ArrayList<>();
sources.add(src);

2
test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess2.java
View File

@ -4,7 +4,7 @@
* @summary Verify correct implementation of JLS2e 6.6.2.1
* @author maddox
*
* @compile/fail/ref=ProtectedMemberAccess2.out --diags:formatterOptions=-simpleNames;layout=%b:%l:%_%m ProtectedMemberAccess2.java
* @compile/fail/ref=ProtectedMemberAccess2.out --diags=formatterOptions=-simpleNames;layout=%b:%l:%_%m ProtectedMemberAccess2.java
*/
// 71 errors expected.

2
test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess3.java
View File

@ -4,7 +4,7 @@
* @summary Verify correct implementation of JLS2e 6.6.2.1
* @author maddox
*
* @compile/fail/ref=ProtectedMemberAccess3.out --diags:formatterOptions=-simpleNames;layout=%b:%l:%_%m ProtectedMemberAccess3.java
* @compile/fail/ref=ProtectedMemberAccess3.out --diags=formatterOptions=-simpleNames;layout=%b:%l:%_%m ProtectedMemberAccess3.java
*/
// 46 errors expected.

2
test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess4.java
View File

@ -4,7 +4,7 @@
* @summary Verify correct implementation of JLS2e 6.6.2.1
* @author maddox
*
* @compile/fail/ref=ProtectedMemberAccess4.out --diags:formatterOptions=-simpleNames;layout=%b:%l:%_%m ProtectedMemberAccess4.java
* @compile/fail/ref=ProtectedMemberAccess4.out --diags=formatterOptions=-simpleNames;layout=%b:%l:%_%m ProtectedMemberAccess4.java
*/
// 33 errors expected.

6
test/langtools/tools/javac/resolve/ResolveHarness.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2016, 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
@ -132,8 +132,8 @@ public class ResolveHarness implements javax.tools.DiagnosticListener<JavaFileOb
protected void check() throws Exception {
String[] options = {
"--should-stop:at=ATTR",
"--debug:verboseResolution=success,failure,applicable,inapplicable,deferred-inference,predef"
"--should-stop=at=ATTR",
"--debug=verboseResolution=success,failure,applicable,inapplicable,deferred-inference,predef"
};
AbstractProcessor[] processors = { new ResolveCandidateFinder(), null };

4
test/langtools/tools/javac/tree/VarTree.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 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
@ -77,7 +77,7 @@ public class VarTree {
String src = prefix + parts[0] + parts[1] + parts[2] + " } }";
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, d -> {},
List.of("--should-stop:at=FLOW"),
List.of("--should-stop=at=FLOW"),
null, Arrays.asList(new MyFileObject(src)));
Iterable<? extends CompilationUnitTree> units = ct.parse();

2
test/langtools/tools/javac/unicode/UnicodeNewline.java
View File

@ -3,7 +3,7 @@
* @bug 4739428 4785453
* @summary when \u000a is used, diagnostics are reported on the wrong line.
*
* @compile/fail/ref=UnicodeNewline.out --diags:layout=%b:%l:%_%m UnicodeNewline.java
* @compile/fail/ref=UnicodeNewline.out --diags=layout=%b:%l:%_%m UnicodeNewline.java
*/
class UnicodeNewline {

4
test/langtools/tools/sjavac/JavacOptionPrep.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 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
@ -96,7 +96,7 @@ public class JavacOptionPrep {
// Ignore this option for now. When the file=... requirement goes
// away, this will be easier to handle.
if (option.startsWith("--debug:completionDeps"))
if (option.startsWith("--debug=completionDeps"))
continue;
switch (option) {