From f0f30baa1f1d5849fdc68b5458f1c0c90f90c0a0 Mon Sep 17 00:00:00 2001 From: David Clarke Date: Tue, 9 Jul 2013 08:57:26 -0400 Subject: [PATCH] Bug 889602 - Set ProfD directory within b2g. r=dhylands --- b2g/components/DirectoryProvider.js | 7 +++++++ testing/mochitest/b2g.json | 8 -------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/b2g/components/DirectoryProvider.js b/b2g/components/DirectoryProvider.js index 866dae3fdcec..1e4167666d6e 100644 --- a/b2g/components/DirectoryProvider.js +++ b/b2g/components/DirectoryProvider.js @@ -61,6 +61,13 @@ DirectoryProvider.prototype = { 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"); diff --git a/testing/mochitest/b2g.json b/testing/mochitest/b2g.json index 4363d7a9f0b9..1ae13a353c05 100644 --- a/testing/mochitest/b2g.json +++ b/testing/mochitest/b2g.json @@ -53,10 +53,6 @@ "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":"", @@ -64,8 +60,6 @@ "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":"", @@ -102,7 +96,6 @@ "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":"", @@ -122,7 +115,6 @@ "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":"",