--- a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Fri Jun 18 11:13:26 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Fri Jun 18 16:56:47 2010 -0700
@@ -353,6 +353,7 @@ public class JavaCompiler implements Cla
context.get(DiagnosticListener.class) != null;
devVerbose = options.get("dev") != null;
processPcks = options.get("process.packages") != null;
+ werror = options.get("-Werror") != null;
verboseCompilePolicy = options.get("verboseCompilePolicy") != null;
@@ -415,6 +416,10 @@ public class JavaCompiler implements Cla
/** Switch: should we (annotation) process packages as well
*/
protected boolean processPcks;
+
+ /** Switch: treat warnings as errors
+ */
+ protected boolean werror;
/** Switch: is annotation processing requested explitly via
* CompilationTask.setProcessors?
@@ -471,8 +476,12 @@ public class JavaCompiler implements Cla
public int errorCount() {
if (delegateCompiler != null && delegateCompiler != this)
return delegateCompiler.errorCount();
- else
+ else {
+ if (werror && log.nerrors == 0 && log.nwarnings > 0) {
+ log.error("warnings.and.werror");
+ }
return log.nerrors;
+ }
}
protected final <T> Queue<T> stopIfError(Queue<T> queue) {
--- a/src/share/classes/com/sun/tools/javac/main/Main.java Fri Jun 18 11:13:26 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/main/Main.java Fri Jun 18 16:56:47 2010 -0700
@@ -381,8 +381,7 @@ public class Main {
classnames.toList(),
processors);
- if (comp.errorCount() != 0 ||
- options.get("-Werror") != null && comp.warningCount() != 0)
+ if (comp.errorCount() != 0)
return EXIT_ERROR;
} catch (IOException ex) {
ioMessage(ex);
--- a/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java Fri Jun 18 11:13:26 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java Fri Jun 18 16:56:47 2010 -0700
@@ -476,7 +476,7 @@ public class RecognizedOptions {
},
// treat warnings as errors
- new HiddenOption(WERROR),
+ new Option(WERROR, "opt.Werror"),
// use complex inference from context in the position of a method call argument
new HiddenOption(COMPLEXINFERENCE),
--- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Fri Jun 18 11:13:26 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Fri Jun 18 16:56:47 2010 -0700
@@ -336,6 +336,9 @@ compiler.err.pkg.annotations.sb.in.packa
package annotations should be in file package-info.java
compiler.err.pkg.clashes.with.class.of.same.name=\
package {0} clashes with class of same name
+
+compiler.err.warnings.and.werror=\
+ warnings found and -Werror specified
# Errors related to annotation processing
--- a/src/share/classes/com/sun/tools/javac/resources/javac.properties Fri Jun 18 11:13:26 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/resources/javac.properties Fri Jun 18 16:56:47 2010 -0700
@@ -69,6 +69,8 @@ javac.opt.target=\
Generate class files for specific VM version
javac.opt.source=\
Provide source compatibility with specified release
+javac.opt.Werror=\
+ Terminate compilation if warnings occur
javac.opt.A=\
Options to pass to annotation processors
javac.opt.implicit=\
--- a/test/tools/javac/6304921/T6304921.out Fri Jun 18 11:13:26 2010 -0700
+++ b/test/tools/javac/6304921/T6304921.out Fri Jun 18 16:56:47 2010 -0700
@@ -3,12 +3,7 @@ required: java.util.List<java.lang.Integ
required: java.util.List<java.lang.Integer>
List<Integer> list = new ArrayList();
^
-T6304921.java:445/445/453: warning: [fallthrough] possible fall-through into case
- default:
- ^
-T6304921.java:522/613/614: warning: [finally] finally clause cannot complete normally
- }
- ^
+error: warnings found and -Werror specified
T6304921.java:727/733/737: cannot find symbol
symbol : variable orr
location: class java.lang.System
@@ -17,5 +12,5 @@ T6304921.java:812/816/822: operator + ca
T6304921.java:812/816/822: operator + cannot be applied to int,boolean
return 123 + true; // bad binary expression
^
-2 errors
-3 warnings
+3 errors
+1 warning
--- a/test/tools/javac/T6241723.out Fri Jun 18 11:13:26 2010 -0700
+++ b/test/tools/javac/T6241723.out Fri Jun 18 16:56:47 2010 -0700
@@ -2,4 +2,6 @@ T6241723.java:23:7: compiler.warn.has.be
T6241723.java:23:7: compiler.warn.has.been.deprecated: A2.A21, A2
T6241723.java:26:5: compiler.warn.has.been.deprecated: Z1, unnamed package
T6241723.java:28:7: compiler.warn.has.been.deprecated: Z2.Z21, Z2
+- compiler.err.warnings.and.werror
+1 error
4 warnings
--- a/test/tools/javac/depDocComment/DeprecatedDocComment.out Fri Jun 18 11:13:26 2010 -0700
+++ b/test/tools/javac/depDocComment/DeprecatedDocComment.out Fri Jun 18 16:56:47 2010 -0700
@@ -1,4 +1,6 @@ DeprecatedDocComment.java:27:28: compile
DeprecatedDocComment.java:27:28: compiler.warn.has.been.deprecated: deprecatedTest1(), DeprecatedDocComment2
DeprecatedDocComment.java:31:28: compiler.warn.has.been.deprecated: deprecatedTest5(), DeprecatedDocComment2
DeprecatedDocComment.java:32:28: compiler.warn.has.been.deprecated: deprecatedTest6(), DeprecatedDocComment2
+- compiler.err.warnings.and.werror
+1 error
3 warnings
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/T6595666.java Fri Jun 18 16:56:47 2010 -0700
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6595666
+ * @summary fix -Werror
+ */
+
+import java.io.*;
+import java.util.*;
+
+public class T6595666 {
+ void m() {
+ // the following line must create warnings with -Xlint, because of unchecked conversion
+ List<Integer> list = new ArrayList();
+ }
+
+ public static void main(String... args) throws Exception {
+ File testSrc = new File(System.getProperty("test.src", "."));
+
+ String basename = T6595666.class.getName();
+ File srcFile = new File(testSrc, basename+".java");
+ File classFile = new File(basename+".class");
+ classFile.delete();
+ if (classFile.exists())
+ throw new Exception("setup error, can't delete " + classFile);
+
+ compile(1, "-d", ".", "-Xlint", "-Werror", srcFile.getPath());
+ if (classFile.exists())
+ throw new Exception("failed: found " + classFile);
+
+ compile(0, "-d", ".", "-Xlint", srcFile.getPath());
+ if (!classFile.exists())
+ throw new Exception("failed: " + classFile + " not found");
+ }
+
+ private static void compile(int rc, String... args) throws Exception {
+ System.err.println("compile: " + Arrays.asList(args));
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ int rc2 = com.sun.tools.javac.Main.compile(args, pw);
+ pw.close();
+ System.err.println(sw);
+ if (rc != rc2)
+ throw new Exception("bad exit code; expected " + rc + ", found " + rc2);
+ }
+}