Bug 889602 - Set ProfD directory within b2g. r=dhylands
☠☠ backed out by bce29c9c7ce3 ☠ ☠
authorDavid Clarke <dclarke@mozilla.com>
Tue, 09 Jul 2013 08:57:26 -0400
changeset 137760 c881d9e4a406d1abced0ed30543712a9c1c18d3a
parent 137759 24484841e7bc37cff76b372ec015b10eaaa80ea4
child 137761 1afda0c66c23f0692c9c364474a192b044fa6065
push idunknown
push userunknown
push dateunknown
reviewersdhylands
bugs889602
milestone25.0a1
Bug 889602 - Set ProfD directory within b2g. r=dhylands
b2g/components/DirectoryProvider.js
testing/mochitest/b2g.json
--- a/b2g/components/DirectoryProvider.js
+++ b/b2g/components/DirectoryProvider.js
@@ -56,16 +56,23 @@ DirectoryProvider.prototype = {
                       "permissionDBPDir", "UpdRootD"];
     if (localProps.indexOf(prop) != -1) {
       let file = Cc["@mozilla.org/file/local;1"]
                    .createInstance(Ci.nsILocalFile)
       file.initWithPath(LOCAL_DIR);
       persistent.value = true;
       return file;
     }
+    if (prop == "ProfD") {
+      let file = Cc["@mozilla.org/file/local;1"]
+                  .createInstance(Ci.nsILocalFile);
+      file.initWithPath(LOCAL_DIR+"/tests/profile");
+      persistent.value = true;
+      return file;
+    }
     if (prop == "coreAppsDir") {
       let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile)
       file.initWithPath("/system/b2g");
       persistent.value = true;
       return file;
     }
     if (prop == UPDATE_ARCHIVE_DIR) {
       // getUpdateDir will set persistent to false since it may toggle between
--- a/testing/mochitest/b2g.json
+++ b/testing/mochitest/b2g.json
@@ -48,29 +48,23 @@
     "content/events/test/test_bug534833.html":"",
     "content/events/test/test_bug603008.html":"",
     "content/events/test/test_bug659071.html":"",
     "content/events/test/test_bug667919-1.html":"",
     "content/events/test/test_bug667919-2.html":"",
     "content/events/test/test_continuous_wheel_events.html":"",
     "content/events/test/test_dom_wheel_event.html":"",
     "content/html/content/test/forms/test_input_file_picker.html":"",
-    "content/html/content/test/forms/test_max_attribute.html":"",
-    "content/html/content/test/forms/test_min_attribute.html":"",
-    "content/html/content/test/forms/test_required_attribute.html":"",
-    "content/html/content/test/forms/test_step_attribute.html":"",
     "content/html/content/test/forms/test_validation.html":"",
     "content/html/content/test/test_bug209275.xhtml":"",
     "content/html/content/test/test_bug430351.html":"",
     "content/html/content/test/test_bug458037.xhtml":"",
     "content/html/content/test/test_bug481335.xhtml":"",
     "content/html/content/test/test_bug523771.html":"",
     "content/html/content/test/test_bug561636.html":"",
-    "content/html/content/test/test_bug590353-2.html":"",
-    "content/html/content/test/test_bug598643.html":"",
     "content/html/content/test/test_bug612730.html":"",
     "content/html/content/test/test_bug613113.html":"",
     "content/html/content/test/test_bug615833.html":"",
     "content/html/content/test/test_bug618948.html":"",
     "content/html/content/test/test_bug619278.html":"",
     "content/html/content/test/test_bug622597.html":"",
     "content/html/content/test/test_fullscreen-api.html":"",
     "content/html/content/test/test_iframe_sandbox_inheritance.html":"",
@@ -97,17 +91,16 @@
     "content/base/test/test_CSP_evalscript.html":"",
     "content/base/test/test_CSP_frameancestors.html":"",
     "content/svg/content/test/test_text_selection.html":"",
     "content/base/test/test_CSP.html":"",
     "content/base/test/test_CrossSiteXHR_origin.html":"",
     "content/base/test/test_bug166235.html":"",
     "content/base/test/test_bug326337.html":"",
     "content/base/test/test_bug330925.xhtml":"",
-    "content/base/test/test_bug403852.html":"",
     "content/base/test/test_bug419527.xhtml":"",
     "content/base/test/test_bug422403-1.html":"",
     "content/base/test/test_bug422537.html":"",
     "content/base/test/test_bug431701.html":"",
     "content/base/test/test_bug564863.xhtml":"",
     "content/base/test/test_bug548193.html":"",
     "content/base/test/test_plugin_freezing.html":"",
     "content/base/test/test_bug444030.xhtml":"",
@@ -117,17 +110,16 @@
     "content/base/test/test_bug650386_redirect_301.html":"",
     "content/base/test/test_bug650386_redirect_302.html":"",
     "content/base/test/test_bug650386_redirect_303.html":"",
     "content/base/test/test_bug650386_redirect_307.html":"",
     "content/base/test/test_bug717511.html":"",
     "content/base/test/test_child_process_shutdown_message.html":"",
     "content/base/test/test_copypaste.html":"",
     "content/base/test/test_csp_redirects.html":"",
-    "content/base/test/test_fileapi.html":"",
     "content/base/test/test_fileapi_slice.html":"",
     "content/base/test/test_messagemanager_assertpermission.html":"",
     "content/base/test/test_mixed_content_blocker.html":"",
     "content/base/test/test_mixed_content_blocker_bug803225.html":"",
     "content/base/test/test_mixed_content_blocker_frameNavigation.html":"",
     "content/base/test/test_mozfiledataurl.html":"",
     "content/base/test/test_websocket.html":"",
     "content/base/test/test_websocket_basic.html":"",