Use environment variables to find the Dart SDK and the Pub cache directory.

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 184 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((_) {
-      // TODO(rnystrom): Hack in the cache directory path. Should pass this in
-      // using environment var once #752 is done.
-      args.insertRange(0, 1, '--cachedir=${pathInSandbox(cachePath)}');
+      // 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.
+      var scriptDir = new File(new Options().script).directorySync().path;
+      var platform = Platform.operatingSystem;
+      var dartBin = join(scriptDir, '../../../tools/testing/bin/$platform/dart');
 
-      // TODO(rnystrom): Hack in the SDK path. Should pass this in using
-      // environment var once #752 is done.
-      args.insertRange(0, 1, '--sdkdir=${pathInSandbox(sdkPath)}');
+      // Find the main pub entrypoint.
+      var pubPath = fs.joinPaths(scriptDir, '../../pub/pub.dart');
 
-      // If an error occurs in pub during testing, we want it to print the stack
-      // trace so it can be debugged.
-      args.insertRange(0, 1, '--trace');
+      var dartArgs =
+        ['--enable-type-checks', '--enable-asserts', pubPath, '--trace'];
+      dartArgs.addAll(args);
 
-      return _runPub(args, pathInSandbox(appPath), pipeStdout: output == null,
+      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) {
       _validateOutput(output, result.stdout);
       _validateOutput(error, result.stderr);
 
       Expect.equals(result.exitCode, exitCode,
           'Pub returned exit code ${result.exitCode}, expected $exitCode.');
 
       return null;
     });
@@ skipping 43 matching lines @@
     if (future != null) {
       return future.chain(runNextEvent);
     } else {
       return runNextEvent();
     }
   }
 
   return runNextEvent();
 }
 
-Future<ProcessResult> _runPub(List<String> pubArgs, String workingDir,
-    [bool pipeStdout=false, bool pipeStderr=false]) {
-  // 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.
-  final scriptDir = new File(new Options().script).directorySync().path;
-  final platform = Platform.operatingSystem;
-  final dartBin = join(scriptDir, '../../../tools/testing/bin/$platform/dart');
-
-  // Find the main pub entrypoint.
-  final pubPath = fs.joinPaths(scriptDir, '../../pub/pub.dart');
-
-  final args = ['--enable-type-checks', '--enable-asserts', pubPath];
-  args.addAll(pubArgs);
-
-  return runProcess(dartBin, args, workingDir, pipeStdout, pipeStderr);
-}
-
 /**
  * Compares the [actual] output from running pub with [expected]. For [String]
  * patterns, ignores leading and trailing whitespace differences and tries to
  * report the offending difference in a nice way. For other [Pattern]s, just
  * reports whether the output contained the pattern.
  */
 void _validateOutput(Pattern expected, List<String> actual) {
   if (expected == null) return;
 
   if (expected is String) return _validateOutputString(expected, actual);
@@ skipping 413 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);
 }