From 6ae4434e2f8203c9619b03d8387f61fef4ea7dbf Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 11 May 2016 16:20:50 -0700
Subject: [PATCH 1/2] Symlink rather than copy the warehouse into the sandbox

Mainly because the dev bundle is so big, it took upwards on 5 mins (on my MBP w/ SSD) to copy the warehouse packages into the sandbox. AFAICT there is no reason not to symlink it if we can.
---
 tools/tool-testing/selftest.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index ab4a3bfc13..29d48c76df 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -13,6 +13,7 @@ var Console = require('../console/console.js').Console;
 var archinfo = require('../utils/archinfo.js');
 var config = require('../meteor-services/config.js');
 var buildmessage = require('../utils/buildmessage.js');
+var Builder = require('../isobuild/builder.js').default;
 
 var catalog = require('../packaging/catalog/catalog.js');
 var catalogRemote = require('../packaging/catalog/catalog-remote.js');
@@ -832,9 +833,13 @@ _.extend(Sandbox.prototype, {
 
     var serverUrl = self.env.METEOR_PACKAGE_SERVER_URL;
     var packagesDirectoryName = config.getPackagesDirectoryName(serverUrl);
-    files.cp_r(files.pathJoin(builtPackageTropohouseDir, 'packages'),
-               files.pathJoin(self.warehouse, packagesDirectoryName),
-               { preserveSymlinks: true });
+
+    var builder = new Builder({outputPath: files.pathJoin(self.warehouse)});
+    builder.copyDirectory({
+      from: files.pathJoin(builtPackageTropohouseDir, 'packages'),
+      to: packagesDirectoryName,
+      symlink: true
+    });
 
     var stubCatalog = {
       syncToken: {},

From 4065990130cad86029bfb5851b3ff5641733ebf2 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Thu, 19 May 2016 09:25:54 -0700
Subject: [PATCH 2/2] Fixed issue with not using builder properly

---
 tools/tool-testing/selftest.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 29d48c76df..b8d4cbca47 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -834,12 +834,13 @@ _.extend(Sandbox.prototype, {
     var serverUrl = self.env.METEOR_PACKAGE_SERVER_URL;
     var packagesDirectoryName = config.getPackagesDirectoryName(serverUrl);
 
-    var builder = new Builder({outputPath: files.pathJoin(self.warehouse)});
+    var builder = new Builder({outputPath: self.warehouse});
     builder.copyDirectory({
       from: files.pathJoin(builtPackageTropohouseDir, 'packages'),
       to: packagesDirectoryName,
       symlink: true
     });
+    builder.complete();
 
     var stubCatalog = {
       syncToken: {},