Bug 939048 - Part d: Move mochitests to manifests in dom/tests/mochit…

…est/webapps/apps; r=jst
dothq · Dec 31, 2013 · 09b5919 · 09b5919
1 parent 6d173f2
commit 09b5919
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 56 deletions.
diff --git a/dom/tests/mochitest/moz.build b/dom/tests/mochitest/moz.build
@@ -17,7 +17,6 @@ DIRS += [
     'sessionstorage',
     'storageevent',
     'notification',
-    'webapps',
     'webcomponents',
 ]
 
@@ -28,10 +27,12 @@ MOCHITEST_MANIFESTS += [
     'dom-level1-core/mochitest.ini',
     'dom-level2-core/mochitest.ini',
     'dom-level2-html/mochitest.ini',
+    'webapps/mochitest.ini',
     'whatwg/mochitest.ini',
 ]
 
 MOCHITEST_CHROME_MANIFESTS += [
+    'webapps/chrome.ini',
     'whatwg/chrome.ini',
 ]
 

diff --git a/dom/tests/mochitest/webapps/apps/Makefile.in b/dom/tests/mochitest/webapps/apps/Makefile.in
diff --git a/dom/tests/mochitest/webapps/apps/moz.build b/dom/tests/mochitest/webapps/apps/moz.build
diff --git a/dom/tests/mochitest/webapps/chrome.ini b/dom/tests/mochitest/webapps/chrome.ini
@@ -3,6 +3,7 @@ support-files =
   cross_origin.html
   head.js
   install_and_redirect_helper.xul
+  apps/*
 
 [test_bug_765063.xul]
 [test_bug_771294.xul]

diff --git a/dom/tests/mochitest/webapps/moz.build b/dom/tests/mochitest/webapps/moz.build