Followup to Bug 593855, some additional needs, a=Bustage

mail/base/test/unit/head_mailbase.js

@@ -1,3 +1,5 @@
+gDEPTH = "../../../../"
+
 // Import the main scripts that mail tests need to set up and tear down
 load("../../../../mailnews/resources/mailDirService.js");
 load("../../../../mailnews/resources/mailTestUtils.js");

mail/base/test/unit/test_viewWrapper_virtualFolderCustomTerm.js

@@ -7,12 +7,12 @@
  *  Original author: Kent James
  */
 
-load("../../mailnews/resources/logHelper.js");
-load("../../mailnews/resources/asyncTestUtils.js");
+load("../../../../mailnews/resources/logHelper.js");
+load("../../../../mailnews/resources/asyncTestUtils.js");
 
-load("../../mailnews/resources/messageGenerator.js");
-load("../../mailnews/resources/messageModifier.js");
-load("../../mailnews/resources/messageInjection.js");
+load("../../../../mailnews/resources/messageGenerator.js");
+load("../../../../mailnews/resources/messageModifier.js");
+load("../../../../mailnews/resources/messageInjection.js");
 
 load("resources/viewWrapperTestUtils.js");
 

mailnews/base/test/unit/test_bug366491.js

@@ -126,7 +126,7 @@ var doTestingListener =
 
 function getSpec(aFileName)
 {
-  var file = do_get_file("../../../bayesian-spam-filter/test/unit/resources/" + aFileName);
+  var file = do_get_file("../../../extensions/bayesian-spam-filter/test/unit/resources/" + aFileName);
   var uri = nsIIOService.newFileURI(file).QueryInterface(Ci.nsIURL);
   uri.query = "type=application/x-message-display";
   return uri.spec;