archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8006037: extra space in javac -help for -J and @ options

Browse source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2013-01-10 14:09:33 -08:00
parent 51e7243003
commit ca5da47efc
2 changed files with 73 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
langtools/src/share/classes/com/sun/tools/javac/main/Option.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2013, 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
@ -311,7 +311,7 @@ public enum Option {
// This option exists only for the purpose of documenting itself.
// It's actually implemented by the launcher.
J("-J", "opt.arg.flag", "opt.J", STANDARD, INFO) {
J("-J", "opt.arg.flag", "opt.J", STANDARD, INFO, true) {
@Override
public boolean process(OptionHelper helper, String option) {
throw new AssertionError
@ -416,7 +416,7 @@ public enum Option {
// This option exists only for the purpose of documenting itself.
// It's actually implemented by the CommandLine class.
AT("@", "opt.arg.file", "opt.AT", STANDARD, INFO) {
AT("@", "opt.arg.file", "opt.AT", STANDARD, INFO, true) {
@Override
public boolean process(OptionHelper helper, String option) {
throw new AssertionError("the @ flag should be caught by CommandLine.");

70
langtools/test/tools/javac/main/Option_J_At_Test.java Normal file
View file

@ -0,0 +1,70 @@
import java.io.PrintWriter;
import java.io.StringWriter;
/*
* Copyright (c) 2013, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8006037
* @summary extra space in javac -help for -J and @ options
*/
public class Option_J_At_Test {
public static void main(String... args) throws Exception {
new Option_J_At_Test().run();
}
void run() throws Exception {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
String[] help = { "-help" };
int rc = com.sun.tools.javac.Main.compile(help, pw);
pw.flush();
String out = sw.toString();
System.out.println(out);
check(out, "-J<flag>", true);
check(out, "-J <flag>", false);
check(out, "@<filename>", true);
check(out, "@ <filename>", false);
if (errors > 0)
throw new Exception(errors + " errors found");
}
void check(String out, String text, boolean expect) {
if (out.contains(text) != expect) {
if (expect)
error("expected string not found: " + text);
else
error("unexpected string found: " + text);
}
}
void error(String msg) {
System.err.println("Error: " + msg);
errors++;
}
int errors;
}