- Simplify command line.

tools/full-coverage.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import "dart:async";
 import "dart:convert";
 import "dart:io";
 import "dart:isolate";
 import "dart:mirrors";
 
@@ skipping 22 matching lines @@
 
   Map _env;
   List failed = [];
 
   Resolver(this._env);
 
   /// Returns the absolute path wrt. to the given environment or null, if the
   /// import could not be resolved.
   resolve(String import) {
     if (import.startsWith(DART_PREFIX)) {
+      if (_env["sdkRoot"] == null) {
+        // No sdk-root given, do not resolve dart: URIs.
+        return null;
+      }
       var slashPos = import.indexOf("/");
       var filePath;
       if (slashPos != -1) {
         var path = import.substring(DART_PREFIX.length, slashPos);
         // Drop patch files, since we don't have their source in the compiled
         // SDK.
         if (path.endsWith("-patch")) {
           failed.add(import);
           return null;
         }
         // Canonicalize path. For instance: _collection-dev => _collection_dev.
         path = path.replaceAll("-", "_");
         filePath = "${_env["sdkRoot"]}"
                    "/${path}${import.substring(slashPos, import.length)}";
       } else {
         // Resolve 'dart:something' to be something/something.dart in the SDK.
         var lib = import.substring(DART_PREFIX.length, import.length);
         filePath = "${_env["sdkRoot"]}/${lib}/${lib}.dart";
       }
       return filePath;
     }
     if (import.startsWith(PACKAGE_PREFIX)) {
+      if (_env["pkgRoot"] == null) {
+        // No package-root given, do not resolve package: URIs.
+        return null;
+      }
       var filePath =
           "${_env["pkgRoot"]}"
           "/${import.substring(PACKAGE_PREFIX.length, import.length)}"; 
       return filePath;
     }
     if (import.startsWith(FILE_PREFIX)) {
       var filePath = fromUri(Uri.parse(import));
       return filePath;
     }
     if (import.startsWith(HTTP_PREFIX)) {
@@ skipping 318 matching lines @@
 }
 
 /// Checks the validity of the provided arguments. Does not initialize actual
 /// processing.
 parseArgs() {
   var parser = new ArgParser();
 
   parser.addOption("sdk-root", abbr: "s",
                    help: "path to the SDK root");
   parser.addOption("package-root", abbr: "p",
-                   help: "path to the package root",
-                   defaultsTo: ".");
+                   help: "path to the package root");
   parser.addOption("in", abbr: "i",
                    help: "input(s): may be file or directory");
   parser.addOption("out", abbr: "o",
                    help: "output: may be file or stdout",
                    defaultsTo: "stdout");
   parser.addOption("workers", abbr: "j",
                    help: "number of workers",
                    defaultsTo: "1");
   parser.addFlag("pretty-print", abbr: "r",
                  help: "convert coverage data to pretty print format",
@@ skipping 19 matching lines @@
     print("\n$msg\n");
     printUsage();
     exit(1);
   }
 
   if (args["help"]) {
     printUsage();
     exit(0);
   }
 
-  if (args["sdk-root"] == null) {
+  env.sdkRoot = args["sdk-root"];
+  if (env.sdkRoot == null) {
     if (Platform.environment.containsKey("SDK_ROOT")) {
       env.sdkRoot =
         join(absolute(normalize(Platform.environment["SDK_ROOT"])), "lib");
-    } else {
-      fail("No SDK root found, please specify one using --sdk-root.");
     }
   } else {
-    env.sdkRoot = join(absolute(normalize(args["sdk-root"])), "lib");
+    env.sdkRoot = join(absolute(normalize(env.sdkRoot)), "lib");
   }
-  if (!FileSystemEntity.isDirectorySync(env.sdkRoot)) {
+  if ((env.sdkRoot != null) && !FileSystemEntity.isDirectorySync(env.sdkRoot)) {
     fail("Provided SDK root '${args["sdk-root"]}' is not a valid SDK "
          "top-level directory");
   }
 
-  if (args["package-root"] == null) {
-    env.pkgRoot = absolute(normalize("./packages"));
-  } else {
+  env.pkgRoot = args["package-root"];
+  if (env.pkgRoot != null) {
     env.pkgRoot = absolute(normalize(args["package-root"]));
     if (!FileSystemEntity.isDirectorySync(env.pkgRoot)) {
       fail("Provided package root '${args["package-root"]}' is not directory.");
     }
   }
 
   if (args["in"] == null) {
     fail("No input files given.");
   } else {
     env.input = absolute(normalize(args["in"]));
     if (!FileSystemEntity.isDirectorySync(env.input) &&
         !FileSystemEntity.isFileSync(env.input)) {
       fail("Provided input '${args["in"]}' is neither a directory, nor a file.");
     }
   }
 
   if (args["out"] == "stdout") {
     env.output = stdout;
   } else {
     env.output = absolute(normalize(args["out"]));
     env.output = new File(env.output).openWrite();
   }
 
-  if (args["pretty-print"] == args["lcov"]) {
-    fail("Choose either pretty-print or lcov output");
+  env.lcov = args["lcov"];
+  if (args["pretty-print"] && env.lcov) {
+    fail("Choose one of pretty-print or lcov output");
+  } else if (!env.lcov) {
+    // Use pretty-print either explicitly or by default.
+    env.prettyPrint = true;
   }
-  env.prettyPrint = args["pretty-print"];
-  env.lcov = args["lcov"];
 
   try {
     env.workers = int.parse("${args["workers"]}");
   } catch (e) {
     fail("Invalid worker count: $e");
   }
 
   env.verbose = args["verbose"];
 }