WIP on 866535, currently non working

lib/sdk/deprecated/unit-test-finder.js

@@ -16,6 +16,8 @@ const cuddlefish = require("sdk/loader/cuddlefish");
 
 const NOT_TESTS = ['setup', 'teardown'];
 
+const {loader_global} = require("sdk/test/harness");
+
 var TestFinder = exports.TestFinder = function TestFinder(options) {
   memory.track(this);
   this.filter = options.filter;
@@ -55,7 +57,7 @@ TestFinder.prototype = {
       function(suite) {
         // Load each test file as a main module in its own loader instance
         // `suite` is defined by cuddlefish/manifest.py:ManifestBuilder.build
-        var loader = Loader(module);
+        var loader = Loader(module,{global:loader_global});
         var module = cuddlefish.main(loader, suite);
 
         if (self.testInProcess)

lib/sdk/test/harness.js

@@ -23,6 +23,8 @@ const unit = require("../deprecated/unit-test");
 const test = require("../../test");
 const url = require("../url");
 
+const loader_global = exports.loader_global = {}; // useful for storing things like coverage testing.
+
 var cService = Cc['@mozilla.org/consoleservice;1'].getService()
                .QueryInterface(Ci.nsIConsoleService);
 
@@ -328,7 +330,7 @@ function getPotentialLeaks() {
         console.error("Unable to parse compartment detail " + matches[1]);
         return;
       }
- 
+
       let item = {
         path: matches[1],
         principal: details[1],
@@ -580,7 +582,7 @@ var runTests = exports.runTests = function runTests(options) {
 
     loader = Loader(module, {
       console: testConsole,
-      global: {} // useful for storing things like coverage testing.
+      global: loader_global
     });
 
     // Load these before getting initial leak stats as they will still be in

lib/sdk/test/loader.js

@@ -10,6 +10,11 @@ const { ensure } = require('../system/unload');
 const addonWindow = require('../addon/window');
 const { PlainTextConsole } = require("sdk/console/plain-text");
 
+let log = function(){
+  let s = Array.join(Array.prototype.slice(arguments)," ");
+  dump(s)
+};
+
 function CustomLoader(module, globals, packaging) {
   let options = packaging || require("@loader/options");
   options = override(options, {
@@ -19,6 +24,11 @@ function CustomLoader(module, globals, packaging) {
      })
   });
 
+  let id = "<unk>"
+  if (module) {id = module.id}
+
+  //log(id, Object.keys(options.globals));
+
   let loader = Loader(options);
   let wrapper = Object.create(loader, descriptor({
     require: Require(loader, module),