Rename BadNumberFormatException -> FormatException.

utils/tests/pub/test_pub.dart

 // Copyright (c) 2012, 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.
 
 /**
  * Test infrastructure for testing pub. Unlike typical unit tests, most pub
  * tests are integration tests that stage some stuff on the file system, run
  * pub, and then validate the results. This library provides an API to build
  * tests like that.
  */
@@ skipping 229 matching lines @@
 /**
  * Schedules a call to the Pub command-line utility. Runs Pub with [args] and
  * validates that its results match [output], [error], and [exitCode].
  */
 void schedulePub([List<String> args, Pattern output, Pattern error,
     int exitCode = 0]) {
   _schedule((sandboxDir) {
     String pathInSandbox(path) => join(getFullPath(sandboxDir), path);
 
     return ensureDir(pathInSandbox(appPath)).chain((_) {
-      // Find a dart executable we can use to run pub. Uses the one that the
-      // test infrastructure uses. We are not using new Options.executable here
-      // because that gets confused if you invoked Dart through a shell script.
+      // Find a Dart executable we can use to spawn. Use the same one that was
+      // used to run this script itself.
+      var dartBin = new Options().executable;
+
+      // If the executable looks like a path, get its full path. That way we
+      // can still find it when we spawn it with a different working directory.
+      if (dartBin.contains(Platform.pathSeparator)) {
+        dartBin = new File(dartBin).fullPathSync();
+      }
+
       var scriptDir = new File(new Options().script).directorySync().path;
-      var platform = Platform.operatingSystem;
-      var dartBin = join(scriptDir, '../../../tools/testing/bin/$platform/dart');
-
-      if (platform == 'windows') dartBin = '$dartBin.exe';
 
       // Find the main pub entrypoint.
       var pubPath = fs.joinPaths(scriptDir, '../../pub/pub.dart');
 
       var dartArgs =
-        ['--enable-type-checks', '--enable-asserts', pubPath, '--trace'];
+          ['--enable-type-checks', '--enable-asserts', pubPath, '--trace'];
       dartArgs.addAll(args);
 
       var environment = new Map.from(Platform.environment);
       environment['PUB_CACHE'] = pathInSandbox(cachePath);
       environment['DART_SDK'] = pathInSandbox(sdkPath);
 
       return runProcess(dartBin, dartArgs, workingDir: pathInSandbox(appPath),
           environment: environment, pipeStdout: output == null,
           pipeStderr: error == null);
     }).transform((result) {
@@ skipping 534 matching lines @@
 }
 
 /**
  * Schedules a callback to be called after Pub is run with [runPub], even if it
  * fails.
  */
 void _scheduleCleanup(_ScheduledEvent event) {
   if (_scheduledCleanup == null) _scheduledCleanup = [];
   _scheduledCleanup.add(event);
 }