From e59d48a955003b80ab202ce500165a3bf5851093 Mon Sep 17 00:00:00 2001
From: Robert Jackson <robert.w.jackson@me.com>
Date: Thu, 11 Feb 2016 22:40:36 -0500
Subject: [PATCH] [BUGFIX] Ensure Glimmer tests are not shipped in builds.

This still ensures that the tests themselves run in the normal test run,
but the tests are included in the ember-tests.js file instead of
ember.debug.js/ember.prod.js.
---
 ember-cli-build.js |  5 +++++
 lib/packages.js    | 13 ++++++++++---
 package.json       |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ember-cli-build.js b/ember-cli-build.js
index 6bcd8a399d8..99225a2b6b6 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -77,6 +77,11 @@ module.exports = function() {
         'amd/glimmer-compiler.amd.map',
         'amd/glimmer-runtime.amd.js',
         'amd/glimmer-runtime.amd.map',
+      ]
+    });
+
+    vendorPackages['glimmer-engine-tests'] = find(glimmerEngine, {
+      include: [
         'amd/glimmer-tests.amd.js',
         'amd/glimmer-tests.amd.map'
       ]
diff --git a/lib/packages.js b/lib/packages.js
index 4ecac11b6fc..6cbce0c0a1c 100644
--- a/lib/packages.js
+++ b/lib/packages.js
@@ -23,9 +23,16 @@ var packages = {
 
 var glimmerStatus = features['ember-glimmer'];
 if (glimmerStatus === null || glimmerStatus === true) {
-  packages['ember-glimmer'] = { trees: null,  requirements: ['ember-metal'], vendorRequirements: [
-    'glimmer-engine'
-  ] };
+  packages['ember-glimmer'] = {
+    trees: null,
+    requirements: ['ember-metal'],
+    vendorRequirements: [
+      'glimmer-engine'
+    ],
+    testingVendorRequirements: [
+      'glimmer-engine-tests'
+    ]
+  };
 }
 
 module.exports = packages;
diff --git a/package.json b/package.json
index 8f82a3f4bb7..ba905d7e6ae 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "ember-cli-sauce": "^1.4.2",
     "ember-cli-yuidoc": "0.7.0",
     "ember-publisher": "0.0.7",
-    "emberjs-build": "0.6.0",
+    "emberjs-build": "0.6.1",
     "express": "^4.5.0",
     "finalhandler": "^0.4.0",
     "github": "^0.2.3",