From e4048680ce7704fda673170b55d8073620e06acc Mon Sep 17 00:00:00 2001
From: Avital Oliver <avital@thewe.net>
Date: Mon, 15 Feb 2016 21:39:07 -0800
Subject: [PATCH] WIP: Unbreak `meteor test-packages`

---
 tools/cli/commands.js    | 2 +-
 tools/isobuild/linker.js | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index cc5e8de935..47b9af7423 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -464,7 +464,7 @@ function doTestCommand(options) {
   // As long as the Meteor CLI runs a single command as part of each
   // process, this should be safe.
   global.testCommandMetadata = {
-    testRunnerPackage: options['test-runner-package']
+    driverPackage: options['driver-package']
   };
 
   Console.setVerbose(!!options.verbose);
diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
index 207e8a378b..144f75d04b 100644
--- a/tools/isobuild/linker.js
+++ b/tools/isobuild/linker.js
@@ -952,7 +952,12 @@ export var fullLink = Profile("linker.fullLink", function (inputFiles, {
     var weAreLinkingTheApp = (name === null);
     if (weAreLinkingTheApp) {
       prelinkedFiles.push({
-        source: "if (Meteor.isClient) Meteor.startup(function() { Package[\"practicalmeteor:mocha\"].runTests(); });",
+        source: `\
+if (Meteor.isClient) {
+  Meteor.startup(function() {
+    Package[\"${global.testCommandMetadata.driverPackage}\"].runTests();
+  });
+}`,
         servePath: "/packages/runTests.js"
       });
     }