Remove barback from the repo.

sdk/lib/_internal/pub/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 88 matching lines @@
 /// third_party/pkg.
 final _barbackDeps = {
   new VersionConstraint.parse("<0.15.0"): {
     "source_maps": "0.9.4"
   }
 };
 
 /// Populates [_barbackVersions].
 Map<Version, String> _findBarbackVersions() {
   var versions = {};
-  var currentBarback = p.join(repoRoot, 'pkg', 'barback');
+  var currentBarback = p.join(repoRoot, 'third_party', 'pkg', 'barback');
   versions[new Pubspec.load(currentBarback, new SourceRegistry()).version] =
       currentBarback;
 
   for (var dir in listDir(p.join(repoRoot, 'third_party', 'pkg'))) {
     var basename = p.basename(dir);
-    if (!basename.startsWith('barback')) continue;
+    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].
 ///
 /// This is used to test that pub doesn't accidentally break older versions of
@@ skipping 99 matching lines @@
 /// `true` if the current test spins up an HTTP server.
 bool _hasServer = false;
 
 /// Converts [value] into a YAML string.
 String yaml(value) => JSON.encode(value);
 
 /// The full path to the created sandbox directory for an integration test.
 String get sandboxDir => _sandboxDir;
 String _sandboxDir;
 
-/// The path to the Dart repo's packages.
-final String pkgPath = p.absolute(p.join(
-    p.dirname(Platform.executable),
-    '../../../../pkg'));
-
 /// The path of the package cache directory used for tests, relative to the
 /// sandbox directory.
 final String cachePath = "cache";
 
 /// The path of the mock app directory used for tests, relative to the sandbox
 /// directory.
 final String appPath = "myapp";
 
 /// The path of the packages directory in the mock app used for tests, relative
 /// to the sandbox directory.
@@ skipping 479 matching lines @@
   if (sandbox != null) {
     for (var package in sandbox) {
       dependencies[package] = '../$package';
     }
   }
 
   if (pkg != null) {
     _addPackage(String package) {
       if (dependencies.containsKey(package)) return;
 
-      var packagePath;
+      var path;
       if (package == 'barback' && _packageOverrides == null) {
         throw new StateError("createLockFile() can only create a lock file "
             "with a barback dependency within a withBarbackVersions() "
             "block.");
       }
 
       if (_packageOverrides.containsKey(package)) {
-        packagePath = _packageOverrides[package];
+        path = _packageOverrides[package];
       } else {
-        packagePath = p.join(pkgPath, package);
+        path = packagePath(package);
       }
 
-      dependencies[package] = packagePath;
+      dependencies[package] = path;
       var pubspec = loadYaml(
-          readTextFile(p.join(packagePath, 'pubspec.yaml')));
+          readTextFile(p.join(path, 'pubspec.yaml')));
       var packageDeps = pubspec['dependencies'];
       if (packageDeps == null) return;
       packageDeps.keys.forEach(_addPackage);
     }
 
     pkg.forEach(_addPackage);
   }
 
   var lockFile = new LockFile.empty();
   dependencies.forEach((name, dependencyPath) {
     var id = new PackageId(name, 'path', new Version(0, 0, 0), {
       'path': dependencyPath,
       'relative': p.isRelative(dependencyPath)
     });
     lockFile.packages[name] = id;
   });
 
   if (hosted != null) {
     hosted.forEach((name, version) {
       var id = new PackageId(name, 'hosted', new Version.parse(version), name);
       lockFile.packages[name] = id;
     });
   }
 
   return lockFile;
 }
 
+/// Returns the path to [package] within the repo.
+String packagePath(String package) =>
+    dirExists(p.join(repoRoot, 'pkg', package)) ?
+        p.join(repoRoot, 'pkg', package) :
+        p.join(repoRoot, 'third_party', 'pkg', package);
+
 /// Uses [client] as the mock HTTP client for this test.
 ///
 /// Note that this will only affect HTTP requests made via http.dart in the
 /// parent process.
 void useMockClient(MockClient client) {
   var oldInnerClient = innerHttpClient;
   innerHttpClient = client;
   currentSchedule.onComplete.schedule(() {
     innerHttpClient = oldInnerClient;
   }, 'de-activating the mock client');
@@ skipping 186 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"));