Bug 983076 - editor/libeditor/html/tests/mochitest.ini contains support files which are actually tests. r=ted
authorJoel Maher <jmaher@mozilla.com>
Thu, 13 Mar 2014 10:39:58 -0400
changeset 191633 858c8264e31cbad868688a571acbd5e6303fe38e
parent 191632 d24d095da3a4611dba320d23fd59b9421a3ab514
child 191634 1c02b7858d1369dd7200b7fe0cc525f6936be81c
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs983076
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 983076 - editor/libeditor/html/tests/mochitest.ini contains support files which are actually tests. r=ted
editor/libeditor/html/tests/browserscope/mochitest.ini
editor/libeditor/html/tests/mochitest.ini
editor/libeditor/html/tests/moz.build
new file mode 100644
--- /dev/null
+++ b/editor/libeditor/html/tests/browserscope/mochitest.ini
@@ -0,0 +1,58 @@
+[default]
+skip-if = buildapp == 'b2g'
+support-files =
+  lib/richtext2/current_revision
+  lib/richtext2/richtext2/common.py
+  lib/richtext2/richtext2/unittestexample.html
+  lib/richtext2/richtext2/static/editable-dM.html
+  lib/richtext2/richtext2/static/editable.css
+  lib/richtext2/richtext2/static/editable-body.html
+  lib/richtext2/richtext2/static/editable-div.html
+  lib/richtext2/richtext2/static/js/variables.js
+  lib/richtext2/richtext2/static/js/range-bootstrap.js
+  lib/richtext2/richtext2/static/js/range.js
+  lib/richtext2/richtext2/static/js/output.js
+  lib/richtext2/richtext2/static/js/compare.js
+  lib/richtext2/richtext2/static/js/canonicalize.js
+  lib/richtext2/richtext2/static/js/pad.js
+  lib/richtext2/richtext2/static/js/run.js
+  lib/richtext2/richtext2/static/js/units.js
+  lib/richtext2/richtext2/static/common.css
+  lib/richtext2/richtext2/__init__.py
+  lib/richtext2/richtext2/handlers.py
+  lib/richtext2/richtext2/templates/output.html
+  lib/richtext2/richtext2/templates/richtext2.html
+  lib/richtext2/richtext2/tests/forwarddelete.py
+  lib/richtext2/richtext2/tests/selection.py
+  lib/richtext2/richtext2/tests/queryIndeterm.py
+  lib/richtext2/richtext2/tests/unapplyCSS.py
+  lib/richtext2/richtext2/tests/apply.py
+  lib/richtext2/richtext2/tests/unapply.py
+  lib/richtext2/richtext2/tests/change.py
+  lib/richtext2/richtext2/tests/queryState.py
+  lib/richtext2/richtext2/tests/queryValue.py
+  lib/richtext2/richtext2/tests/__init__.py
+  lib/richtext2/richtext2/tests/insert.py
+  lib/richtext2/richtext2/tests/queryEnabled.py
+  lib/richtext2/richtext2/tests/applyCSS.py
+  lib/richtext2/richtext2/tests/changeCSS.py
+  lib/richtext2/richtext2/tests/delete.py
+  lib/richtext2/richtext2/tests/querySupported.py
+  lib/richtext2/README
+  lib/richtext2/update_from_upstream
+  lib/richtext2/LICENSE
+  lib/richtext2/README.Mozilla
+  lib/richtext2/currentStatus.js
+  lib/richtext/current_revision
+  lib/richtext/README
+  lib/richtext/update_from_upstream
+  lib/richtext/LICENSE
+  lib/richtext/README.Mozilla
+  lib/richtext/richtext/editable.html
+  lib/richtext/richtext/richtext.html
+  lib/richtext/richtext/js/range.js
+  lib/richtext/currentStatus.js
+
+[test_richtext2.html]
+[test_richtext.html]
+
--- a/editor/libeditor/html/tests/mochitest.ini
+++ b/editor/libeditor/html/tests/mochitest.ini
@@ -1,63 +1,10 @@
 [DEFAULT]
 support-files =
-  browserscope/test_richtext2.html
-  browserscope/test_richtext.html
-  browserscope/lib/richtext2/current_revision
-  browserscope/lib/richtext2/richtext2/common.py
-  browserscope/lib/richtext2/richtext2/unittestexample.html
-  browserscope/lib/richtext2/richtext2/static/editable-dM.html
-  browserscope/lib/richtext2/richtext2/static/editable.css
-  browserscope/lib/richtext2/richtext2/static/editable-body.html
-  browserscope/lib/richtext2/richtext2/static/editable-div.html
-  browserscope/lib/richtext2/richtext2/static/js/variables.js
-  browserscope/lib/richtext2/richtext2/static/js/range-bootstrap.js
-  browserscope/lib/richtext2/richtext2/static/js/range.js
-  browserscope/lib/richtext2/richtext2/static/js/output.js
-  browserscope/lib/richtext2/richtext2/static/js/compare.js
-  browserscope/lib/richtext2/richtext2/static/js/canonicalize.js
-  browserscope/lib/richtext2/richtext2/static/js/pad.js
-  browserscope/lib/richtext2/richtext2/static/js/run.js
-  browserscope/lib/richtext2/richtext2/static/js/units.js
-  browserscope/lib/richtext2/richtext2/static/common.css
-  browserscope/lib/richtext2/richtext2/__init__.py
-  browserscope/lib/richtext2/richtext2/handlers.py
-  browserscope/lib/richtext2/richtext2/templates/output.html
-  browserscope/lib/richtext2/richtext2/templates/richtext2.html
-  browserscope/lib/richtext2/richtext2/tests/forwarddelete.py
-  browserscope/lib/richtext2/richtext2/tests/selection.py
-  browserscope/lib/richtext2/richtext2/tests/queryIndeterm.py
-  browserscope/lib/richtext2/richtext2/tests/unapplyCSS.py
-  browserscope/lib/richtext2/richtext2/tests/apply.py
-  browserscope/lib/richtext2/richtext2/tests/unapply.py
-  browserscope/lib/richtext2/richtext2/tests/change.py
-  browserscope/lib/richtext2/richtext2/tests/queryState.py
-  browserscope/lib/richtext2/richtext2/tests/queryValue.py
-  browserscope/lib/richtext2/richtext2/tests/__init__.py
-  browserscope/lib/richtext2/richtext2/tests/insert.py
-  browserscope/lib/richtext2/richtext2/tests/queryEnabled.py
-  browserscope/lib/richtext2/richtext2/tests/applyCSS.py
-  browserscope/lib/richtext2/richtext2/tests/changeCSS.py
-  browserscope/lib/richtext2/richtext2/tests/delete.py
-  browserscope/lib/richtext2/richtext2/tests/querySupported.py
-  browserscope/lib/richtext2/README
-  browserscope/lib/richtext2/update_from_upstream
-  browserscope/lib/richtext2/LICENSE
-  browserscope/lib/richtext2/README.Mozilla
-  browserscope/lib/richtext2/currentStatus.js
-  browserscope/lib/richtext/current_revision
-  browserscope/lib/richtext/README
-  browserscope/lib/richtext/update_from_upstream
-  browserscope/lib/richtext/LICENSE
-  browserscope/lib/richtext/README.Mozilla
-  browserscope/lib/richtext/richtext/editable.html
-  browserscope/lib/richtext/richtext/richtext.html
-  browserscope/lib/richtext/richtext/js/range.js
-  browserscope/lib/richtext/currentStatus.js
   data/cfhtml-chromium.txt
   data/cfhtml-firefox.txt
   data/cfhtml-ie.txt
   data/cfhtml-ooo.txt
   data/cfhtml-nocontext.txt
   file_bug549262.html
   file_bug674770-1.html
   file_select_all_without_body.html
--- a/editor/libeditor/html/tests/moz.build
+++ b/editor/libeditor/html/tests/moz.build
@@ -1,10 +1,11 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MOCHITEST_MANIFESTS += ['mochitest.ini']
+MOCHITEST_MANIFESTS += ['browserscope/mochitest.ini', 
+                        'mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']