Make the tests work in the Dart repo.

test/test_pub.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.
 
 /// 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.
 library test_pub;
@@ skipping 94 matching lines @@
 final _barbackDeps = {
   new VersionConstraint.parse("<0.15.0"): {
     "source_maps": "0.9.4"
   }
 };
 
 /// Populates [_barbackVersions].
 Map<Version, String> _findBarbackVersions() {
   var versions = {};
 
-  // It would be nice if this could use HostedSource's logic, but it's
-  // asynchronous and this is a variable initializer.
-  var currentBarback = packagePath('barback');
-  versions[_entrypoint.lockFile.packages['barback'].version] = currentBarback;
+  var currentBarback;
+  var pkgPath;
+  if (runningFromDartRepo) {
+    currentBarback = p.join(dartRepoRoot, 'third_party', 'pkg', 'barback');
+    pkgPath = p.join(dartRepoRoot, 'third_party', 'pkg');
+  } else {
+    // It would be nice if this could use HostedSource's logic, but it's
+    // asynchronous and this is a variable initializer.
+    currentBarback = packagePath('barback');
+    pkgPath = p.join(pubRoot, 'third_party');
+  }
+  versions[new Pubspec.load(currentBarback, new SourceRegistry()).version] =
+      currentBarback;
 
-  for (var dir in listDir(p.join(pubRoot, 'third_party'))) {
+  for (var dir in listDir(pkgPath)) {
     var basename = p.basename(dir);
     if (!basename.startsWith('barback-')) continue;
     versions[new Version.parse(split1(basename, '-').last)] = dir;
   }
 
   return versions;
 }
 
 /// Runs the tests in [callback] against all versions of barback in the repo
 /// that match [versionConstraint].
@@ skipping 12 matching lines @@
 
   for (var version in validVersions) {
     group("with barback $version", () {
       setUp(() {
         _packageOverrides = {};
         _packageOverrides['barback'] = _barbackVersions[version];
         _barbackDeps.forEach((constraint, deps) {
           if (!constraint.allows(version)) return;
 
           deps.forEach((packageName, version) {
-            _packageOverrides[packageName] = p.join(
-                pubRoot, 'third_party', '$packageName-$version');
+            _packageOverrides[packageName] = runningFromDartRepo
+                ? p.join(dartRepoRoot, 'third_party/pkg/$packageName-$version')
+                : p.join(pubRoot, 'third_party/$packageName-$version');
           });
         });
 
         currentSchedule.onComplete.schedule(() {
           _packageOverrides = null;
         });
       });
 
       callback();
     });
@@ skipping 406 matching lines @@
 
   writeTextFile(hashPath, hash);
   writeTextFile(versionPath, version);
 }
 
 /// Returns a hash that encapsulates the current state of the repo.
 String _hashChanges() {
   var hash = new SHA1();
 
   // Include the current Git commit.
-  hash.add(UTF8.encode(gitlib.runSync(['rev-parse', 'HEAD']).first));
+  hash.add(UTF8.encode(
+      gitlib.runSync(['rev-parse', 'HEAD'], workingDir: pubRoot).first));
 
   // Include the changes in lib and bin relative to the current Git commit.
-  var tracked = gitlib.runSync(['diff-index', '--patch', 'HEAD', 'lib', 'bin']);
+  var tracked = gitlib.runSync(['diff-index', '--patch', 'HEAD', 'lib', 'bin'],
+      workingDir: pubRoot);
   for (var line in tracked) {
     hash.add(UTF8.encode("$line\n"));
   }
 
   // Include the full contents of non-ignored files in lib and bin that aren't
   // tracked by Git.
   var untracked = gitlib.runSync(
-      ['ls-files', '--others', '--exclude-standard', 'lib', 'bin']);
+      ['ls-files', '--others', '--exclude-standard', 'lib', 'bin'],
+      workingDir: pubRoot);
   for (var path in untracked) {
     hash.add(readBinaryFile(path));
   }
 
   return CryptoUtils.bytesToHex(hash.close());
 }
 
 /// A subclass of [ScheduledProcess] that parses pub's verbose logging output
 /// and makes [stdout] and [stderr] work as though pub weren't running in
 /// verbose mode.
@@ skipping 215 matching lines @@
       var id = new PackageId(name, 'hosted', new Version.parse(version), name);
       lockFile.packages[name] = id;
     });
   }
 
   return lockFile;
 }
 
 /// Returns the path to the version of [package] used by pub.
 String packagePath(String package) {
+  if (runningFromDartRepo) {
+    return dirExists(p.join(dartRepoRoot, 'pkg', package))
+        ? p.join(dartRepoRoot, 'pkg', package)
+        : p.join(dartRepoRoot, 'third_party', 'pkg', package);
+  }
+
   var id = _entrypoint.lockFile.packages[package];
   if (id == null) {
     throw new StateError(
         'The tests rely on "$package", but it\'s not in the lockfile.');
   }
 
   return p.join(
       SystemCache.defaultDir,
       'hosted/pub.dartlang.org/$package-${id.version}');
 }
@@ skipping 189 matching lines @@
         _lastMatcher.matches(item.last, matchState);
   }
 
   Description describe(Description description) {
     return description.addAll("(", ", ", ")", [_firstMatcher, _lastMatcher]);
   }
 }
 
 /// A [StreamMatcher] that matches multiple lines of output.
 StreamMatcher emitsLines(String output) => inOrder(output.split("\n"));