dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Issue 8051. dart_analyzer return codes on errors

Browse Source 
http://code.google.com/p/dart/issues/detail?id=8051

R=devoncarew@google.com,whesse@google.com
BUG=

Review URL: https://codereview.chromium.org//12041051

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@17622 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
scheglov@google.com
2013-01-25 00:47:48 +00:00
parent e9e57f1209
commit be31b47690
4 changed files with 68 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/java/com/google/dart/compiler/DartCompiler.java
+53 -26
View File
@@ -75,6 +75,26 @@ import java.util.Set;
*/
public class DartCompiler {
static final int RESULT_OK = 0;
static final int RESULT_WARNINGS = 1;
static final int RESULT_ERRORS = 2;
static final int RESULT_OTHER = 127;
static class Result {
final int code;
final String message;
public Result(int code, String message) {
this.code = code;
this.message = message;
}
Result merge(Result other) {
if (other.code > code) {
return other;
}
return this;
}
}
public static final String EXTENSION_DEPS = "deps";
public static final String EXTENSION_LOG = "log";
public static final String EXTENSION_TIMESTAMP = "timestamp";
@@ -1006,7 +1026,7 @@ public class DartCompiler {
Tracer.init();
CompilerOptions topCompilerOptions = processCommandLineOptions(topArgs);
boolean result = false;
Result result = null;
try {
// configure UTF-8 output
System.setOut(new PrintStream(System.out, true, "UTF-8"));
@@ -1014,7 +1034,7 @@ public class DartCompiler {
if (topCompilerOptions.showVersion()) {
showVersion(topCompilerOptions);
System.exit(0);
System.exit(RESULT_OK);
}
if (topCompilerOptions.shouldBatch()) {
if (topArgs.length > 1) {
@@ -1022,7 +1042,7 @@ public class DartCompiler {
}
result = UnitTestBatchRunner.runAsBatch(topArgs, new Invocation() {
@Override
public boolean invoke(String[] lineArgs) throws Throwable {
public Result invoke(String[] lineArgs) throws Throwable {
List<String> allArgs = new ArrayList<String>();
for (String arg: topArgs) {
if (!arg.equals("-batch")) {
@@ -1048,31 +1068,30 @@ public class DartCompiler {
t.printStackTrace();
crash();
}
if (!result) {
System.exit(1);
}
System.exit(result.code);
}
/**
* Invoke the compiler to build single application.
*
*
* @param compilerOptions parsed command line arguments
*
* @return <code> true</code> on success, <code>false</code> on failure.
* @return the result as integer when <code>0</code> means clean; <code>1</code> there were
* warnings; <code>2</code> there were errors; <code>127</code> other problems or
* exceptions.
*/
public static boolean compilerMain(CompilerOptions compilerOptions) throws IOException {
public static Result compilerMain(CompilerOptions compilerOptions) throws IOException {
List<String> sourceFiles = compilerOptions.getSourceFiles();
if (sourceFiles.size() == 0) {
System.err.println("dart_analyzer: no source files were specified.");
showUsage(null, System.err);
return false;
return new Result(RESULT_OTHER, null);
}
File sourceFile = new File(sourceFiles.get(0));
if (!sourceFile.exists()) {
System.err.println("dart_analyzer: file not found: " + sourceFile);
showUsage(null, System.err);
return false;
return new Result(RESULT_OTHER, null);
}
CompilerConfiguration config = new DefaultCompilerConfiguration(compilerOptions);
@@ -1085,15 +1104,14 @@ public class DartCompiler {
*
* @param sourceFile file passed on the command line to build
* @param config compiler configuration built from parsed command line options
*
* @return <code> true</code> on success, <code>false</code> on failure.
*/
public static boolean compilerMain(File sourceFile, CompilerConfiguration config)
public static Result compilerMain(File sourceFile, CompilerConfiguration config)
throws IOException {
String errorMessage = compileApp(sourceFile, config);
Result result = compileApp(sourceFile, config);
String errorMessage = result.message;
if (errorMessage != null) {
System.err.println(errorMessage);
return false;
return result;
}
TraceEvent logEvent = Tracer.canTrace() ? Tracer.start(DartEventType.WRITE_METRICS) : null;
@@ -1102,7 +1120,7 @@ public class DartCompiler {
} finally {
Tracer.end(logEvent);
}
return true;
return result;
}
public static void crash() {
@@ -1132,8 +1150,12 @@ public class DartCompiler {
* Treats the <code>sourceFile</code> as the top level library and generates compiled output by
* linking the dart source in this file with all libraries referenced with <code>#import</code>
* statements.
*
* @return the result as integer when <code>0</code> means clean; <code>1</code> there were
* warnings; <code>2</code> there were errors; <code>127</code> other problems or
* exceptions.
*/
public static String compileApp(File sourceFile, CompilerConfiguration config) throws IOException {
public static Result compileApp(File sourceFile, CompilerConfiguration config) throws IOException {
TraceEvent logEvent =
Tracer.canTrace() ? Tracer.start(DartEventType.COMPILE_APP, "src", sourceFile.toString())
: null;
@@ -1160,8 +1182,7 @@ public class DartCompiler {
} else {
listener = new DefaultDartCompilerListener(config.printErrorFormat());
}
String errorString = compileLib(lib, config, provider, listener);
return errorString;
return compileLib(lib, config, provider, listener);
} finally {
Tracer.end(logEvent);
}
@@ -1176,7 +1197,7 @@ public class DartCompiler {
* @param provider A mechanism for specifying where code should be generated
* @param listener An object notified when compilation errors occur
*/
public static String compileLib(LibrarySource lib, CompilerConfiguration config,
public static Result compileLib(LibrarySource lib, CompilerConfiguration config,
DartArtifactProvider provider, DartCompilerListener listener) throws IOException {
return compileLib(lib, Collections.<LibrarySource>emptyList(), config, provider, listener);
}
@@ -1185,7 +1206,7 @@ public class DartCompiler {
* Same method as above, but also takes a list of libraries that should be
* implicitly imported by all libraries. These libraries are provided by the embedder.
*/
public static String compileLib(LibrarySource lib,
public static Result compileLib(LibrarySource lib,
List<LibrarySource> embeddedLibraries,
CompilerConfiguration config,
DartArtifactProvider provider,
@@ -1201,8 +1222,8 @@ public class DartCompiler {
errorCount += context.getWarningCount();
}
if (errorCount > 0) {
return "Compilation failed with " + errorCount
+ (errorCount == 1 ? " problem." : " problems.");
return new Result(RESULT_ERRORS, "Compilation failed with " + errorCount
+ (errorCount == 1 ? " problem." : " problems."));
}
if (!context.getFilesHaveChanged()) {
return null;
@@ -1220,7 +1241,13 @@ public class DartCompiler {
Closeables.close(writer, threw);
}
}
return null;
{
int resultCode = RESULT_OK;
if (context.getWarningCount() != 0) {
resultCode = RESULT_WARNINGS;
}
return new Result(resultCode, null);
}
}
/**
compiler/java/com/google/dart/compiler/DartCompilerMainContext.java
+2 -1
View File
@@ -89,7 +89,8 @@ final class DartCompilerMainContext implements DartCompilerListener, DartCompile
// Increment counters.
if (event.getErrorCode().getSubSystem() == SubSystem.STATIC_TYPE) {
incrementTypeErrorCount();
} else if (event.getErrorCode().getErrorSeverity() == ErrorSeverity.ERROR) {
}
if (event.getErrorCode().getErrorSeverity() == ErrorSeverity.ERROR) {
incrementErrorCount();
} else if (event.getErrorCode().getErrorSeverity() == ErrorSeverity.WARNING) {
incrementWarningCount();
compiler/java/com/google/dart/compiler/UnitTestBatchRunner.java
+11 -9
View File
@@ -5,6 +5,8 @@
package com.google.dart.compiler;
import com.google.dart.compiler.DartCompiler.Result;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -16,7 +18,7 @@ import java.io.InputStreamReader;
public class UnitTestBatchRunner {
public interface Invocation {
public boolean invoke (String[] args) throws Throwable;
public Result invoke (String[] args) throws Throwable;
}
/**
@@ -25,7 +27,7 @@ public class UnitTestBatchRunner {
*
* @param batchArgs command line arguments forwarded from main().
*/
public static boolean runAsBatch(String[] batchArgs, Invocation toolInvocation) throws Throwable {
public static Result runAsBatch(String[] batchArgs, Invocation toolInvocation) throws Throwable {
System.out.println(">>> BATCH START");
// Read command lines in from stdin and create a new compiler for each one.
@@ -34,23 +36,23 @@ public class UnitTestBatchRunner {
long startTime = System.currentTimeMillis();
int testsFailed = 0;
int totalTests = 0;
boolean batchResult = true;
Result batchResult = new Result(DartCompiler.RESULT_OK, null);
try {
String line;
for (; (line = cmdlineReader.readLine()) != null; totalTests++) {
long testStart = System.currentTimeMillis();
// TODO(zundel): These are shell script cmdlines: be smarter about
// quoted strings.
// TODO(zundel): These are shell script cmdlines: be smarter about quoted strings.
String[] args = line.trim().split("\\s+");
boolean result = toolInvocation.invoke(args);
if (!result) {
Result result = toolInvocation.invoke(args);
boolean resultPass = result.code >= DartCompiler.RESULT_ERRORS;
if (resultPass) {
testsFailed++;
}
batchResult &= result;
batchResult = batchResult.merge(result);
// Write stderr end token and flush.
System.err.println(">>> EOF STDERR");
System.err.flush();
System.out.println(">>> TEST " + (result ? "PASS" : "FAIL") + " "
System.out.println(">>> TEST " + (resultPass ? "PASS" : "FAIL") + " "
+ (System.currentTimeMillis() - testStart) + "ms");
System.out.flush();
}
tools/testing/dart/test_runner.dart
+2 -2
View File
@@ -840,13 +840,13 @@ class AnalysisCommandOutputImpl extends CommandOutputImpl {
}
if (errors.length == 0) {
if (!hasFatalTypeErrors && exitCode != 0) {
if (!hasFatalTypeErrors && !(exitCode == 0 || exitCode == 1)) {
diagnostics.add("EXIT CODE MISMATCH: Expected error message:");
diagnostics.add(" command[0]:${testCase.commands[0]}");
diagnostics.add(" exitCode:${exitCode}");
return true;
}
} else if (exitCode == 0) {
} else if (exitCode == 0 || exitCode == 1) {
diagnostics.add("EXIT CODE MISMATCH: Unexpected error message:");
diagnostics.add(" errors[0]:${errors[0]}");
diagnostics.add(" command[0]:${testCase.commands[0]}");