Bug 971132 - B2G mochitests should use the new manifest format for ru…

…ntests; r=jmaher
shellylin · Mar 13, 2014 · c75ff96 · c75ff96
1 parent b811300
commit c75ff96
Show file tree

Hide file tree

Showing 46 changed files with 47 additions and 22 deletions.
diff --git a/browser/base/content/test/general/mochitest.ini b/browser/base/content/test/general/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   audio.ogg
   bug364677-data.xml

diff --git a/browser/components/feeds/test/mochitest.ini b/browser/components/feeds/test/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   bug368464-data.xml
   bug408328-data.xml

diff --git a/editor/composer/test/mochitest.ini b/editor/composer/test/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = bug678842_subframe.html
 
 [test_bug348497.html]

diff --git a/editor/libeditor/base/tests/mochitest.ini b/editor/libeditor/base/tests/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = file_bug586662.html
 
 [test_bug408231.html]

diff --git a/editor/libeditor/html/tests/mochitest.ini b/editor/libeditor/html/tests/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   data/cfhtml-chromium.txt
   data/cfhtml-firefox.txt

diff --git a/editor/libeditor/text/tests/mochitest.ini b/editor/libeditor/text/tests/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 
 [test_bug318065.html]
 [test_bug471722.html]

diff --git a/embedding/test/mochitest.ini b/embedding/test/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   320x240.ogv
   bug293834_form.html

diff --git a/extensions/cookie/test/mochitest.ini b/extensions/cookie/test/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   beltzner.jpg
   beltzner.jpg^headers^

diff --git a/gfx/tests/mochitest.ini b/gfx/tests/mochitest.ini
@@ -1,3 +1,5 @@
+[DEFAULT]
+skip-if = buildapp == 'b2g'
 [mochitest/test_bug509244.html]
 [mochitest/test_bug513439.html]
 [mochitest/test_acceleration.html]
diff --git a/image/test/mochitest/mochitest.ini b/image/test/mochitest/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   INT32_MIN.bmp
   animated-gif2.gif

diff --git a/intl/uconv/tests/mochitest.ini b/intl/uconv/tests/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 
 [test_bug335816.html]
 [test_bug843434.html]

diff --git a/js/jsd/test/mochitest.ini b/js/jsd/test/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   bug507448.js
   jsd-test.js

diff --git a/js/xpconnect/tests/mochitest/mochitest.ini b/js/xpconnect/tests/mochitest/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   bug500931_helper.html
   bug504877_helper.html

diff --git a/modules/libjar/test/mochitest/mochitest.ini b/modules/libjar/test/mochitest/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   bug403331.zip
   bug403331.zip^headers^

diff --git a/netwerk/test/mochitests/mochitest.ini b/netwerk/test/mochitests/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   partial_content.sjs
   user_agent.sjs

diff --git a/parser/htmlparser/tests/mochitest/mochitest.ini b/parser/htmlparser/tests/mochitest/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   bug_502091_iframe.html
   file_bug102699.sjs

diff --git a/security/manager/ssl/tests/mochitest/bugs/mochitest.ini b/security/manager/ssl/tests/mochitest/bugs/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 
 [test_bug480509.html]
 skip-if = toolkit == 'android'

diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini b/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = toolkit == 'android' #TIMED_OUT
+skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
 support-files =
   alloworigin.sjs
   backward.html

diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini b/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   nosts_bootstrap.html
   nosts_bootstrap.html^headers^

diff --git a/testing/mochitest/MochiKit/mochitest.ini b/testing/mochitest/MochiKit/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   /MochiKit/Async.js
   /MochiKit/Base.js

diff --git a/testing/mochitest/b2g-debug.json b/testing/mochitest/b2g-debug.json
@@ -1,12 +1,5 @@
 {
 "runtests": {
-    "b2g": "",
-    "caps": "",
-    "content": "",
-    "docshell": "",
-    "dom": "",
-    "layout": "",
-    "toolkit/devtools/apps": ""
   },
 "excludetests": {
   }

diff --git a/testing/mochitest/b2g-desktop.json b/testing/mochitest/b2g-desktop.json
@@ -1,12 +1,5 @@
 {
 "runtests": {
-    "b2g": "",
-    "caps": "",
-    "content": "",
-    "docshell": "",
-    "dom": "",
-    "layout": "",
-    "toolkit/devtools/apps": ""
   },
 "excludetests": {
   }

diff --git a/testing/mochitest/b2g.json b/testing/mochitest/b2g.json
@@ -1,12 +1,5 @@
 {
 "runtests": {
-    "b2g": "",
-    "caps": "",
-    "content": "",
-    "docshell": "",
-    "dom": "",
-    "layout": "",
-    "toolkit/devtools/apps": ""
   },
 "excludetests": {
   }

diff --git a/testing/mochitest/dynamic/mochitest.ini b/testing/mochitest/dynamic/mochitest.ini
@@ -1,2 +1,3 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = /dynamic/getMyDirectory.sjs
diff --git a/testing/mochitest/static/mochitest.ini b/testing/mochitest/static/mochitest.ini
@@ -1,2 +1,3 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = /static/harness.css
diff --git a/testing/mochitest/tests/Harness_sanity/mochitest.ini b/testing/mochitest/tests/Harness_sanity/mochitest.ini
@@ -1,3 +1,5 @@
+[DEFAULT]
+skip-if = buildapp == 'b2g'
 [test_sanity.html]
 [test_sanityException.html]
 [test_sanityException2.html]

diff --git a/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/mochitest.ini b/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   Async.js
   Base.js

diff --git a/testing/mochitest/tests/MochiKit-1.4.2/tests/mochitest.ini b/testing/mochitest/tests/MochiKit-1.4.2/tests/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   SimpleTest/test.css
   test_Base.js

diff --git a/toolkit/components/alerts/test/mochitest.ini b/toolkit/components/alerts/test/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 
 # Synchronous tests like test_alerts.html must come before
 # asynchronous tests like test_alerts_noobserve.html!

diff --git a/toolkit/components/microformats/tests/mochitest.ini b/toolkit/components/microformats/tests/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = geo.html
 
 [test_Microformats.html]

diff --git a/toolkit/components/passwordmgr/test/mochitest.ini b/toolkit/components/passwordmgr/test/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   authenticate.sjs
   formsubmit.sjs

diff --git a/toolkit/components/places/tests/browser/mochitest.ini b/toolkit/components/places/tests/browser/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   399606-httprefresh.html
   399606-location.reload.html

diff --git a/toolkit/components/places/tests/chrome/mochitest.ini b/toolkit/components/places/tests/chrome/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   sample_feed.atom
   bad_links.atom

diff --git a/toolkit/components/places/tests/mochitest.ini b/toolkit/components/places/tests/mochitest.ini
@@ -1,2 +1,3 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = bug94514-postpage.html
diff --git a/toolkit/components/places/tests/mochitest/bug_411966/mochitest.ini b/toolkit/components/places/tests/mochitest/bug_411966/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   redirect.js
   TypedPage.htm

diff --git a/toolkit/components/places/tests/mochitest/bug_461710/mochitest.ini b/toolkit/components/places/tests/mochitest/bug_461710/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   visited_page.html
   link_page.html

diff --git a/toolkit/components/prompts/test/mochitest.ini b/toolkit/components/prompts/test/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   bug619644_inner.html
   bug625187_iframe.html

diff --git a/toolkit/components/satchel/test/mochitest.ini b/toolkit/components/satchel/test/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   satchel_common.js
   subtst_form_submission_1.html

diff --git a/toolkit/components/url-classifier/tests/mochitest/mochitest.ini b/toolkit/components/url-classifier/tests/mochitest/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   classifierFrame.html
   cleanWorker.js

diff --git a/toolkit/content/tests/widgets/mochitest.ini b/toolkit/content/tests/widgets/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   ../../../../content/media/test/audio.wav
   ../../../../browser/base/content/test/general/audio.ogg

diff --git a/toolkit/modules/tests/mochitest/mochitest.ini b/toolkit/modules/tests/mochitest/mochitest.ini
@@ -1 +1,3 @@
+[DEFAULT]
+skip-if = buildapp == 'b2g'
 [test_spatial_navigation.html]
diff --git a/toolkit/mozapps/extensions/test/mochitest/mochitest.ini b/toolkit/mozapps/extensions/test/mochitest/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   file_empty.html
 

diff --git a/toolkit/xre/test/mochitest.ini b/toolkit/xre/test/mochitest.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 
 [test_fpuhandler.html]
diff --git a/uriloader/exthandler/tests/mochitest/mochitest.ini b/uriloader/exthandler/tests/mochitest/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   handlerApp.xhtml
   handlerApps.js

diff --git a/webapprt/test/content/mochitest.ini b/webapprt/test/content/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   test.webapp
   test.webapp^headers^

diff --git a/widget/tests/mochitest.ini b/widget/tests/mochitest.ini
@@ -1,3 +1,5 @@
+[DEFAULT]
+skip-if = buildapp == 'b2g'
 [test_assign_event_data.html]
 skip-if = toolkit == "cocoa" # Bug 933303
 [test_bug565392.html]