From 835d2f9bd586a3a7e792a4cb5f64ae364df9d640 Mon Sep 17 00:00:00 2001 From: Chris Manchester Date: Wed, 27 Jan 2016 17:46:34 -0800 Subject: [PATCH] Bug 1243096 - Remove ini manifests containing only support-files and move their contents to TEST_HARNESS_FILES. r=gps --- devtools/client/framework/moz.build | 4 +- devtools/client/framework/test/xpcshell.ini | 7 -- devtools/client/promisedebugger/moz.build | 2 - .../client/promisedebugger/test/browser.ini | 5 -- devtools/shared/apps/moz.build | 10 ++- devtools/shared/apps/tests/data/mochitest.ini | 8 -- docshell/moz.build | 19 ++++- docshell/test/chrome/mochitest.ini | 17 ---- dom/base/test/chrome/mochitest.ini | 6 -- dom/base/test/moz.build | 8 +- dom/imptests/mochitest.ini | 7 -- dom/imptests/moz.build | 9 +- dom/media/webaudio/moz.build | 7 +- dom/media/webaudio/test/blink/mochitest.ini | 6 -- dom/tests/mochitest/ajax/lib/mochitest.ini | 4 - .../ajax/mochikit/tests/mochitest.ini | 33 -------- dom/tests/moz.build | 45 +++++++++- js/xpconnect/tests/chrome/mochitest.ini | 4 - js/xpconnect/tests/chrome/moz.build | 5 +- js/xpconnect/tests/moz.build | 10 ++- js/xpconnect/tests/xpcshell.ini | 8 -- layout/reftests/fonts/math/mochitest.ini | 40 --------- layout/reftests/fonts/mochitest.ini | 3 - layout/reftests/fonts/mplus/mochitest.ini | 3 - layout/reftests/moz.build | 51 +++++++++++- layout/style/test/chrome/mochitest.ini | 4 - layout/style/test/css-visited/mochitest.ini | 75 ----------------- layout/style/test/moz.build | 83 ++++++++++++++++++- python/mozbuild/mozbuild/frontend/emitter.py | 6 +- .../absolute-support.ini | 2 + .../test_file.js | 0 .../mozbuild/test/frontend/test_emitter.py | 13 ++- testing/mochitest/MochiKit/mochitest.ini | 23 ----- testing/mochitest/dynamic/mochitest.ini | 3 - testing/mochitest/moz.build | 57 ++++++++++++- testing/mochitest/static/mochitest.ini | 3 - .../MochiKit-1.4.2/MochiKit/mochitest.ini | 22 ----- toolkit/components/jsdownloads/moz.build | 7 +- .../jsdownloads/test/data/xpcshell.ini | 6 -- .../places/tests/browser/mochitest.ini | 20 ----- .../places/tests/chrome/mochitest.ini | 9 -- toolkit/components/places/tests/mochitest.ini | 3 - .../tests/mochitest/bug_411966/mochitest.ini | 10 --- .../tests/mochitest/bug_461710/mochitest.ini | 8 -- toolkit/components/places/tests/moz.build | 62 ++++++++++++-- toolkit/components/places/tests/xpcshell.ini | 2 - 46 files changed, 357 insertions(+), 382 deletions(-) delete mode 100644 devtools/client/framework/test/xpcshell.ini delete mode 100644 devtools/client/promisedebugger/test/browser.ini delete mode 100644 devtools/shared/apps/tests/data/mochitest.ini delete mode 100644 docshell/test/chrome/mochitest.ini delete mode 100644 dom/base/test/chrome/mochitest.ini delete mode 100644 dom/imptests/mochitest.ini delete mode 100644 dom/media/webaudio/test/blink/mochitest.ini delete mode 100644 dom/tests/mochitest/ajax/lib/mochitest.ini delete mode 100644 dom/tests/mochitest/ajax/mochikit/tests/mochitest.ini delete mode 100644 js/xpconnect/tests/chrome/mochitest.ini delete mode 100644 js/xpconnect/tests/xpcshell.ini delete mode 100644 layout/reftests/fonts/math/mochitest.ini delete mode 100644 layout/reftests/fonts/mochitest.ini delete mode 100644 layout/reftests/fonts/mplus/mochitest.ini delete mode 100644 layout/style/test/chrome/mochitest.ini delete mode 100644 layout/style/test/css-visited/mochitest.ini create mode 100644 python/mozbuild/mozbuild/test/frontend/data/test-manifest-absolute-support/test_file.js delete mode 100644 testing/mochitest/MochiKit/mochitest.ini delete mode 100644 testing/mochitest/dynamic/mochitest.ini delete mode 100644 testing/mochitest/static/mochitest.ini delete mode 100644 testing/mochitest/tests/MochiKit-1.4.2/MochiKit/mochitest.ini delete mode 100644 toolkit/components/jsdownloads/test/data/xpcshell.ini delete mode 100644 toolkit/components/places/tests/browser/mochitest.ini delete mode 100644 toolkit/components/places/tests/chrome/mochitest.ini delete mode 100644 toolkit/components/places/tests/mochitest.ini delete mode 100644 toolkit/components/places/tests/mochitest/bug_411966/mochitest.ini delete mode 100644 toolkit/components/places/tests/mochitest/bug_461710/mochitest.ini delete mode 100644 toolkit/components/places/tests/xpcshell.ini diff --git a/devtools/client/framework/moz.build b/devtools/client/framework/moz.build index c955e7a1e19..b86982d3d76 100644 --- a/devtools/client/framework/moz.build +++ b/devtools/client/framework/moz.build @@ -5,7 +5,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] -XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini'] +TEST_HARNESS_FILES.xpcshell.devtools.client.framework.test += [ + 'test/shared-redux-head.js', +] DevToolsModules( 'attach-thread.js', diff --git a/devtools/client/framework/test/xpcshell.ini b/devtools/client/framework/test/xpcshell.ini deleted file mode 100644 index daec5d11c6b..00000000000 --- a/devtools/client/framework/test/xpcshell.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -tags = devtools -head = -tail = -firefox-appdir = browser -support-files = - shared-redux-head.js diff --git a/devtools/client/promisedebugger/moz.build b/devtools/client/promisedebugger/moz.build index 97f0d96c376..410f88aa46b 100644 --- a/devtools/client/promisedebugger/moz.build +++ b/devtools/client/promisedebugger/moz.build @@ -4,7 +4,5 @@ # 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/. -BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] - DevToolsModules( ) diff --git a/devtools/client/promisedebugger/test/browser.ini b/devtools/client/promisedebugger/test/browser.ini deleted file mode 100644 index a4e847a4cff..00000000000 --- a/devtools/client/promisedebugger/test/browser.ini +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -tags = devtools -subsuite = devtools -support-files = - head.js diff --git a/devtools/shared/apps/moz.build b/devtools/shared/apps/moz.build index 27d07edad65..6f22be8bf06 100644 --- a/devtools/shared/apps/moz.build +++ b/devtools/shared/apps/moz.build @@ -4,10 +4,18 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. MOCHITEST_MANIFESTS += [ - 'tests/data/mochitest.ini', 'tests/mochitest.ini', ] +TEST_HARNESS_FILES.testing.mochitest.tests.devtools.shared.apps.tests.data += [ + 'tests/data/app-certified.zip', + 'tests/data/app-overload.zip', + 'tests/data/app-redirect.zip', + 'tests/data/app-system.zip', + 'tests/data/app-updated.zip', + 'tests/data/app.zip', +] + XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] DevToolsModules( diff --git a/devtools/shared/apps/tests/data/mochitest.ini b/devtools/shared/apps/tests/data/mochitest.ini deleted file mode 100644 index 72f5dcc54a6..00000000000 --- a/devtools/shared/apps/tests/data/mochitest.ini +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -support-files = - app-redirect.zip - app-updated.zip - app.zip - app-certified.zip - app-overload.zip - app-system.zip diff --git a/docshell/moz.build b/docshell/moz.build index f0898e799d0..711a881ba28 100644 --- a/docshell/moz.build +++ b/docshell/moz.build @@ -17,7 +17,6 @@ XPCSHELL_TESTS_MANIFESTS += [ ] MOCHITEST_MANIFESTS += [ - 'test/chrome/mochitest.ini', 'test/iframesandbox/mochitest.ini', 'test/mochitest.ini', 'test/navigation/mochitest.ini', @@ -31,3 +30,21 @@ BROWSER_CHROME_MANIFESTS += [ 'test/browser/browser.ini', 'test/navigation/browser.ini', ] + +TEST_HARNESS_FILES.testing.mochitest.tests.docshell.test.chrome += [ + 'test/chrome/112564_nocache.html', + 'test/chrome/112564_nocache.html^headers^', + 'test/chrome/215405_nocache.html', + 'test/chrome/215405_nocache.html^headers^', + 'test/chrome/215405_nostore.html', + 'test/chrome/215405_nostore.html^headers^', + 'test/chrome/582176_dummy.html', + 'test/chrome/582176_xml.xml', + 'test/chrome/582176_xslt.xsl', + 'test/chrome/92598_nostore.html', + 'test/chrome/92598_nostore.html^headers^', + 'test/chrome/allowContentRetargeting.sjs', + 'test/chrome/blue.png', + 'test/chrome/bug89419.sjs', + 'test/chrome/red.png', +] diff --git a/docshell/test/chrome/mochitest.ini b/docshell/test/chrome/mochitest.ini deleted file mode 100644 index 929a770ea38..00000000000 --- a/docshell/test/chrome/mochitest.ini +++ /dev/null @@ -1,17 +0,0 @@ -[DEFAULT] -support-files = - bug89419.sjs - blue.png - red.png - 92598_nostore.html - 92598_nostore.html^headers^ - 112564_nocache.html - 112564_nocache.html^headers^ - 215405_nostore.html - 215405_nostore.html^headers^ - 215405_nocache.html - 215405_nocache.html^headers^ - 582176_dummy.html - 582176_xml.xml - 582176_xslt.xsl - allowContentRetargeting.sjs diff --git a/dom/base/test/chrome/mochitest.ini b/dom/base/test/chrome/mochitest.ini deleted file mode 100644 index 4cc1880f0a9..00000000000 --- a/dom/base/test/chrome/mochitest.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -support-files = - bug421622-referer.sjs - nochrome_bug765993.html - nochrome_bug765993.js - nochrome_bug765993.js^headers^ diff --git a/dom/base/test/moz.build b/dom/base/test/moz.build index 0e21c2f09d4..e33a548d706 100644 --- a/dom/base/test/moz.build +++ b/dom/base/test/moz.build @@ -16,7 +16,6 @@ GeckoCppUnitTests([ ]) MOCHITEST_MANIFESTS += [ - 'chrome/mochitest.ini', 'mochitest.ini', 'websocket_hybi/mochitest.ini', ] @@ -40,3 +39,10 @@ BROWSER_CHROME_MANIFESTS += [ TEST_DIRS += [ 'gtest', ] + +TEST_HARNESS_FILES.testing.mochitest.tests.dom.base.test.chrome += [ + 'chrome/bug421622-referer.sjs', + 'chrome/nochrome_bug765993.html', + 'chrome/nochrome_bug765993.js', + 'chrome/nochrome_bug765993.js^headers^', +] diff --git a/dom/imptests/mochitest.ini b/dom/imptests/mochitest.ini deleted file mode 100644 index b3659e25b72..00000000000 --- a/dom/imptests/mochitest.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -support-files = - /resources/testharness.js - /resources/testharnessreport.js - /resources/testharness.css - /resources/idlharness.js - /resources/WebIDLParser.js diff --git a/dom/imptests/moz.build b/dom/imptests/moz.build index 54414b2b7bc..5ff7595a03b 100644 --- a/dom/imptests/moz.build +++ b/dom/imptests/moz.build @@ -7,7 +7,6 @@ MOCHITEST_MANIFESTS += [ 'editing/mochitest.ini', 'html/mochitest.ini', - 'mochitest.ini', 'webapps/mochitest.ini', ] @@ -33,3 +32,11 @@ MOCHITEST_MANIFESTS += [ 'failures/html/typedarrays/mochitest.ini', 'failures/webapps/WebStorage/tests/submissions/Infraware/mochitest.ini', ] + +TEST_HARNESS_FILES.testing.mochitest.resources += [ + 'idlharness.js', + 'testharness.css', + 'testharness.js', + 'testharnessreport.js', + 'WebIDLParser.js', +] diff --git a/dom/media/webaudio/moz.build b/dom/media/webaudio/moz.build index a36daa5a3e9..39af1b115d7 100644 --- a/dom/media/webaudio/moz.build +++ b/dom/media/webaudio/moz.build @@ -12,12 +12,17 @@ DIRS += ['blink'] TEST_DIRS += ['compiledtest'] MOCHITEST_MANIFESTS += [ - 'test/blink/mochitest.ini', 'test/mochitest.ini', ] MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini'] +TEST_HARNESS_FILES.testing.mochitest.tests.dom.media.webaudio.test.blink += [ + 'test/blink/audio-testing.js', + 'test/blink/convolution-testing.js', + 'test/blink/panner-model-testing.js', +] + EXPORTS += [ 'AlignedTArray.h', 'AudioBlock.h', diff --git a/dom/media/webaudio/test/blink/mochitest.ini b/dom/media/webaudio/test/blink/mochitest.ini deleted file mode 100644 index 7ce24cfa1cc..00000000000 --- a/dom/media/webaudio/test/blink/mochitest.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -tags=msg -support-files = - audio-testing.js - convolution-testing.js - panner-model-testing.js diff --git a/dom/tests/mochitest/ajax/lib/mochitest.ini b/dom/tests/mochitest/ajax/lib/mochitest.ini deleted file mode 100644 index bec49cd2a5b..00000000000 --- a/dom/tests/mochitest/ajax/lib/mochitest.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -support-files = - AJAX_setup.js - test.css diff --git a/dom/tests/mochitest/ajax/mochikit/tests/mochitest.ini b/dom/tests/mochitest/ajax/mochikit/tests/mochitest.ini deleted file mode 100644 index 9f437b7b63a..00000000000 --- a/dom/tests/mochitest/ajax/mochikit/tests/mochitest.ini +++ /dev/null @@ -1,33 +0,0 @@ -[DEFAULT] -support-files = - FakeJSAN.js - MochiKit-Async.html - MochiKit-Base.html - MochiKit-Color.html - MochiKit-DOM.html - MochiKit-DateTime.html - MochiKit-DragAndDrop.html - MochiKit-Format.html - MochiKit-Iter.html - MochiKit-JSAN.html - MochiKit-Logging.html - MochiKit-MochiKit.html - MochiKit-Selector.html - MochiKit-Signal.html - MochiKit-Style.html - MochiKit-Visual.html - cli.js - index.html - standalone.js - SimpleTest/SimpleTest.js - SimpleTest/TestRunner.js - SimpleTest/test.css - test_Base.js - test_Color.js - test_DateTime.js - test_DragAndDrop.js - test_Format.js - test_Iter.js - test_Logging.js - test_MochiKit-Async.json - test_Signal.js diff --git a/dom/tests/moz.build b/dom/tests/moz.build index f9a23463a4e..621a7e84cde 100644 --- a/dom/tests/moz.build +++ b/dom/tests/moz.build @@ -6,9 +6,7 @@ MOCHITEST_MANIFESTS += [ 'mochitest/ajax/jquery/mochitest.ini', - 'mochitest/ajax/lib/mochitest.ini', 'mochitest/ajax/mochikit/mochitest.ini', - 'mochitest/ajax/mochikit/tests/mochitest.ini', 'mochitest/ajax/offline/mochitest.ini', 'mochitest/ajax/prototype/mochitest.ini', 'mochitest/ajax/scriptaculous/mochitest.ini', @@ -50,3 +48,46 @@ if CONFIG['MOZ_GAMEPAD']: XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] BROWSER_CHROME_MANIFESTS += ['browser/browser.ini'] + +TEST_HARNESS_FILES.testing.mochitest.tests.dom.tests.mochitest.ajax.lib += [ + 'mochitest/ajax/lib/AJAX_setup.js', + 'mochitest/ajax/lib/test.css', +] + +TEST_HARNESS_FILES.testing.mochitest.tests.dom.tests.mochitest.ajax.mochikit.tests += [ + 'mochitest/ajax/mochikit/tests/cli.js', + 'mochitest/ajax/mochikit/tests/FakeJSAN.js', + 'mochitest/ajax/mochikit/tests/index.html', + 'mochitest/ajax/mochikit/tests/MochiKit-Async.html', + 'mochitest/ajax/mochikit/tests/MochiKit-Base.html', + 'mochitest/ajax/mochikit/tests/MochiKit-Color.html', + 'mochitest/ajax/mochikit/tests/MochiKit-DateTime.html', + 'mochitest/ajax/mochikit/tests/MochiKit-DOM.html', + 'mochitest/ajax/mochikit/tests/MochiKit-DragAndDrop.html', + 'mochitest/ajax/mochikit/tests/MochiKit-Format.html', + 'mochitest/ajax/mochikit/tests/MochiKit-Iter.html', + 'mochitest/ajax/mochikit/tests/MochiKit-JSAN.html', + 'mochitest/ajax/mochikit/tests/MochiKit-Logging.html', + 'mochitest/ajax/mochikit/tests/MochiKit-MochiKit.html', + 'mochitest/ajax/mochikit/tests/MochiKit-Selector.html', + 'mochitest/ajax/mochikit/tests/MochiKit-Signal.html', + 'mochitest/ajax/mochikit/tests/MochiKit-Style.html', + 'mochitest/ajax/mochikit/tests/MochiKit-Visual.html', + 'mochitest/ajax/mochikit/tests/standalone.js', + 'mochitest/ajax/mochikit/tests/test_Base.js', + 'mochitest/ajax/mochikit/tests/test_Color.js', + 'mochitest/ajax/mochikit/tests/test_DateTime.js', + 'mochitest/ajax/mochikit/tests/test_DragAndDrop.js', + 'mochitest/ajax/mochikit/tests/test_Format.js', + 'mochitest/ajax/mochikit/tests/test_Iter.js', + 'mochitest/ajax/mochikit/tests/test_Logging.js', + 'mochitest/ajax/mochikit/tests/test_MochiKit-Async.json', + 'mochitest/ajax/mochikit/tests/test_Signal.js', +] + +TEST_HARNESS_FILES.testing.mochitest.tests.dom.tests.mochitest.ajax.mochikit.tests.SimpleTest += [ + 'mochitest/ajax/mochikit/tests/SimpleTest/SimpleTest.js', + 'mochitest/ajax/mochikit/tests/SimpleTest/test.css', + 'mochitest/ajax/mochikit/tests/SimpleTest/TestRunner.js', +] + diff --git a/js/xpconnect/tests/chrome/mochitest.ini b/js/xpconnect/tests/chrome/mochitest.ini deleted file mode 100644 index 83320a4820e..00000000000 --- a/js/xpconnect/tests/chrome/mochitest.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -support-files = - file_discardSystemSource.html - worker_discardSystemSource.js diff --git a/js/xpconnect/tests/chrome/moz.build b/js/xpconnect/tests/chrome/moz.build index 5244ac16b12..d3265e92b91 100644 --- a/js/xpconnect/tests/chrome/moz.build +++ b/js/xpconnect/tests/chrome/moz.build @@ -5,5 +5,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. MOCHITEST_CHROME_MANIFESTS += ['chrome.ini'] -MOCHITEST_MANIFESTS += ['mochitest.ini'] +TEST_HARNESS_FILES.testing.mochitest.tests.js.xpconnect.tests.chrome += [ + 'file_discardSystemSource.html', + 'worker_discardSystemSource.js', +] diff --git a/js/xpconnect/tests/moz.build b/js/xpconnect/tests/moz.build index dc04d4d6539..48eabe97d49 100644 --- a/js/xpconnect/tests/moz.build +++ b/js/xpconnect/tests/moz.build @@ -14,5 +14,13 @@ TEST_DIRS += [ XPCSHELL_TESTS_MANIFESTS += [ 'unit/xpcshell.ini', - 'xpcshell.ini', +] + +TEST_HARNESS_FILES.xpcshell.js.xpconnect.tests.components.js += [ + 'components/js/xpctest.manifest', + 'components/js/xpctest_attributes.js', + 'components/js/xpctest_bug809674.js', + 'components/js/xpctest_interfaces.js', + 'components/js/xpctest_params.js', + 'components/js/xpctest_returncode_child.js', ] diff --git a/js/xpconnect/tests/xpcshell.ini b/js/xpconnect/tests/xpcshell.ini deleted file mode 100644 index c600acb9f30..00000000000 --- a/js/xpconnect/tests/xpcshell.ini +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -support-files = - components/js/xpctest_attributes.js - components/js/xpctest_bug809674.js - components/js/xpctest_interfaces.js - components/js/xpctest_params.js - components/js/xpctest_returncode_child.js - components/js/xpctest.manifest diff --git a/layout/reftests/fonts/math/mochitest.ini b/layout/reftests/fonts/math/mochitest.ini deleted file mode 100644 index ff6ebcc04ce..00000000000 --- a/layout/reftests/fonts/math/mochitest.ini +++ /dev/null @@ -1,40 +0,0 @@ -[DEFAULT] -support-files = - /tests/fonts/math/axis-height-1.otf - /tests/fonts/math/axis-height-2.otf - /tests/fonts/math/fraction-1.otf - /tests/fonts/math/fraction-2.otf - /tests/fonts/math/fraction-3.otf - /tests/fonts/math/fraction-4.otf - /tests/fonts/math/fraction-5.otf - /tests/fonts/math/fraction-6.otf - /tests/fonts/math/fraction-7.otf - /tests/fonts/math/fraction-8.otf - /tests/fonts/math/fraction-9.otf - /tests/fonts/math/limits-1.otf - /tests/fonts/math/limits-2.otf - /tests/fonts/math/limits-3.otf - /tests/fonts/math/limits-4.otf - /tests/fonts/math/limits-5.otf - /tests/fonts/math/radical-1.otf - /tests/fonts/math/radical-2.otf - /tests/fonts/math/radical-3.otf - /tests/fonts/math/radical-4.otf - /tests/fonts/math/radical-5.otf - /tests/fonts/math/radical-6.otf - /tests/fonts/math/radical-7.otf - /tests/fonts/math/scripts-1.otf - /tests/fonts/math/scripts-2.otf - /tests/fonts/math/scripts-3.otf - /tests/fonts/math/scripts-4.otf - /tests/fonts/math/scripts-5.otf - /tests/fonts/math/scripts-6.otf - /tests/fonts/math/scripts-7.otf - /tests/fonts/math/scripts-8.otf - /tests/fonts/math/scripts-9.otf - /tests/fonts/math/stack-1.otf - /tests/fonts/math/stack-2.otf - /tests/fonts/math/stack-3.otf - /tests/fonts/math/stack-4.otf - /tests/fonts/math/stack-5.otf - /tests/fonts/math/stack-6.otf diff --git a/layout/reftests/fonts/mochitest.ini b/layout/reftests/fonts/mochitest.ini deleted file mode 100644 index cbf5e1df97c..00000000000 --- a/layout/reftests/fonts/mochitest.ini +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] -support-files = - /tests/fonts/Ahem.ttf diff --git a/layout/reftests/fonts/mplus/mochitest.ini b/layout/reftests/fonts/mplus/mochitest.ini deleted file mode 100644 index dc5461dc528..00000000000 --- a/layout/reftests/fonts/mplus/mochitest.ini +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] -support-files = - /tests/fonts/mplus/mplus-1p-regular.ttf diff --git a/layout/reftests/moz.build b/layout/reftests/moz.build index 9d5c5f0f427..1ae1afde4fb 100644 --- a/layout/reftests/moz.build +++ b/layout/reftests/moz.build @@ -4,10 +4,53 @@ # 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 += [ - 'fonts/math/mochitest.ini', - 'fonts/mochitest.ini', - 'fonts/mplus/mochitest.ini' +TEST_HARNESS_FILES.testing.mochitest.tests.fonts.math += [ + 'fonts/math/axis-height-1.otf', + 'fonts/math/axis-height-2.otf', + 'fonts/math/fraction-1.otf', + 'fonts/math/fraction-2.otf', + 'fonts/math/fraction-3.otf', + 'fonts/math/fraction-4.otf', + 'fonts/math/fraction-5.otf', + 'fonts/math/fraction-6.otf', + 'fonts/math/fraction-7.otf', + 'fonts/math/fraction-8.otf', + 'fonts/math/fraction-9.otf', + 'fonts/math/limits-1.otf', + 'fonts/math/limits-2.otf', + 'fonts/math/limits-3.otf', + 'fonts/math/limits-4.otf', + 'fonts/math/limits-5.otf', + 'fonts/math/radical-1.otf', + 'fonts/math/radical-2.otf', + 'fonts/math/radical-3.otf', + 'fonts/math/radical-4.otf', + 'fonts/math/radical-5.otf', + 'fonts/math/radical-6.otf', + 'fonts/math/radical-7.otf', + 'fonts/math/scripts-1.otf', + 'fonts/math/scripts-2.otf', + 'fonts/math/scripts-3.otf', + 'fonts/math/scripts-4.otf', + 'fonts/math/scripts-5.otf', + 'fonts/math/scripts-6.otf', + 'fonts/math/scripts-7.otf', + 'fonts/math/scripts-8.otf', + 'fonts/math/scripts-9.otf', + 'fonts/math/stack-1.otf', + 'fonts/math/stack-2.otf', + 'fonts/math/stack-3.otf', + 'fonts/math/stack-4.otf', + 'fonts/math/stack-5.otf', + 'fonts/math/stack-6.otf', +] + +TEST_HARNESS_FILES.testing.mochitest.tests.fonts.mplus += [ + 'fonts/mplus/mplus-1p-regular.ttf', +] + +TEST_HARNESS_FILES.testing.mochitest.tests.fonts += [ + 'fonts/Ahem.ttf', ] REFTEST_MANIFESTS += ['reftest.list'] diff --git a/layout/style/test/chrome/mochitest.ini b/layout/style/test/chrome/mochitest.ini deleted file mode 100644 index acc88368bea..00000000000 --- a/layout/style/test/chrome/mochitest.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -support-files = - moz_document_helper.html - additional_sheets_helper.html diff --git a/layout/style/test/css-visited/mochitest.ini b/layout/style/test/css-visited/mochitest.ini deleted file mode 100644 index f49993e52d2..00000000000 --- a/layout/style/test/css-visited/mochitest.ini +++ /dev/null @@ -1,75 +0,0 @@ -[DEFAULT] -support-files = - ../../../../layout/reftests/css-visited/color-on-text-decoration-1-ref.html - ../../../../layout/reftests/css-visited/selector-descendant-2-ref.xhtml - ../../../../layout/reftests/css-visited/selector-child-1-ref.html - ../../../../layout/reftests/css-visited/subject-of-selector-descendant-1.html - ../../../../layout/reftests/css-visited/inherit-keyword-1-ref.html - ../../../../layout/reftests/css-visited/visited-page.html - ../../../../layout/reftests/css-visited/border-2b.html - ../../../../layout/reftests/css-visited/color-on-link-before-1.html - ../../../../layout/reftests/css-visited/border-2a.html - ../../../../layout/reftests/css-visited/color-on-visited-1.html - ../../../../layout/reftests/css-visited/selector-adj-sibling-1.html - ../../../../layout/reftests/css-visited/selector-any-sibling-1.html - ../../../../layout/reftests/css-visited/column-rule-1.html - ../../../../layout/reftests/css-visited/selector-child-1.html - ../../../../layout/reftests/css-visited/subject-of-selector-any-sibling-1.html - ../../../../layout/reftests/css-visited/content-before-1-ref.html - ../../../../layout/reftests/css-visited/color-on-link-1-ref.html - ../../../../layout/reftests/css-visited/color-choice-1-ref.html - ../../../../layout/reftests/css-visited/subject-of-selector-descendant-2.xhtml - ../../../../layout/reftests/css-visited/width-on-visited-1.html - ../../../../layout/reftests/css-visited/selector-child-2-ref.xhtml - ../../../../layout/reftests/css-visited/border-1.html - ../../../../layout/reftests/css-visited/link-root-1.xhtml - ../../../../layout/reftests/css-visited/link-root-1-ref.xhtml - ../../../../layout/reftests/css-visited/color-on-visited-1-ref.html - ../../../../layout/reftests/css-visited/selector-any-sibling-1-ref.html - ../../../../layout/reftests/css-visited/border-1-ref.html - ../../../../layout/reftests/css-visited/column-rule-1-ref.html - ../../../../layout/reftests/css-visited/content-on-link-before-1.html - ../../../../layout/reftests/css-visited/color-on-link-1.html - ../../../../layout/reftests/css-visited/selector-descendant-2.xhtml - ../../../../layout/reftests/css-visited/content-color-on-visited-before-1.html - ../../../../layout/reftests/css-visited/inherit-keyword-1.xhtml - ../../../../layout/reftests/css-visited/selector-descendant-1-ref.html - ../../../../layout/reftests/css-visited/subject-of-selector-descendant-2-ref.xhtml - ../../../../layout/reftests/css-visited/selector-adj-sibling-2-ref.html - ../../../../layout/reftests/css-visited/border-2-ref.html - ../../../../layout/reftests/css-visited/mathml-links.html - ../../../../layout/reftests/css-visited/selector-child-2.xhtml - ../../../../layout/reftests/css-visited/column-rule-1-notref.html - ../../../../layout/reftests/css-visited/white-to-transparent-1-ref.html - ../../../../layout/reftests/css-visited/first-line-1.html - ../../../../layout/reftests/css-visited/selector-any-sibling-2-ref.html - ../../../../layout/reftests/css-visited/content-color-on-visited-before-1-ref.html - ../../../../layout/reftests/css-visited/color-on-bullets-1.html - ../../../../layout/reftests/css-visited/outline-1-ref.html - ../../../../layout/reftests/css-visited/content-on-visited-before-1.html - ../../../../layout/reftests/css-visited/color-choice-1.html - ../../../../layout/reftests/css-visited/selector-adj-sibling-2.html - ../../../../layout/reftests/css-visited/selector-descendant-1.html - ../../../../layout/reftests/css-visited/subject-of-selector-1-ref.html - ../../../../layout/reftests/css-visited/white-to-transparent-1.html - ../../../../layout/reftests/css-visited/width-on-link-1.html - ../../../../layout/reftests/css-visited/mathml-links-ref.html - ../../../../layout/reftests/css-visited/outline-1.html - ../../../../layout/reftests/css-visited/color-on-bullets-1-ref.html - ../../../../layout/reftests/css-visited/selector-adj-sibling-1-ref.html - ../../../../layout/reftests/css-visited/subject-of-selector-adj-sibling-1.html - ../../../../layout/reftests/css-visited/border-collapse-1-ref.html - ../../../../layout/reftests/css-visited/first-line-1-ref.html - ../../../../layout/reftests/css-visited/border-collapse-1.html - ../../../../layout/reftests/css-visited/selector-any-sibling-2.html - ../../../../layout/reftests/css-visited/width-1-ref.html - ../../../../layout/reftests/css-visited/color-on-visited-before-1.html - ../../../../layout/reftests/css-visited/color-on-text-decoration-1.html - ../../../../layout/reftests/css-visited/content-color-on-link-before-1-ref.html - ../../../../layout/reftests/css-visited/subject-of-selector-child-1.html - ../../../../layout/reftests/css-visited/content-color-on-link-before-1.html - ../../../../layout/reftests/svg/pseudo-classes-02.svg - ../../../../layout/reftests/svg/pseudo-classes-02-ref.svg - ../../../../layout/reftests/svg/as-image/lime100x100.svg - ../../../../layout/reftests/svg/as-image/svg-image-visited-1-helper.svg - ../../../../layout/reftests/svg/as-image/svg-image-visited-2-helper.svg diff --git a/layout/style/test/moz.build b/layout/style/test/moz.build index ef05e532ef0..38ad8af6c2b 100644 --- a/layout/style/test/moz.build +++ b/layout/style/test/moz.build @@ -11,12 +11,91 @@ HostSimplePrograms([ ]) MOCHITEST_MANIFESTS += [ - 'chrome/mochitest.ini', - 'css-visited/mochitest.ini', 'mochitest.ini', ] XPCSHELL_TESTS_MANIFESTS += ['xpcshell.ini'] BROWSER_CHROME_MANIFESTS += ['browser.ini'] MOCHITEST_CHROME_MANIFESTS += ['chrome/chrome.ini'] +TEST_HARNESS_FILES.testing.mochitest.tests.layout.style.test.chrome += [ + 'chrome/additional_sheets_helper.html', + 'chrome/moz_document_helper.html', +] + +TEST_HARNESS_FILES.testing.mochitest.tests.layout.style.test['css-visited'] += [ + '/layout/reftests/css-visited/border-1-ref.html', + '/layout/reftests/css-visited/border-1.html', + '/layout/reftests/css-visited/border-2-ref.html', + '/layout/reftests/css-visited/border-2a.html', + '/layout/reftests/css-visited/border-2b.html', + '/layout/reftests/css-visited/border-collapse-1-ref.html', + '/layout/reftests/css-visited/border-collapse-1.html', + '/layout/reftests/css-visited/color-choice-1-ref.html', + '/layout/reftests/css-visited/color-choice-1.html', + '/layout/reftests/css-visited/color-on-bullets-1-ref.html', + '/layout/reftests/css-visited/color-on-bullets-1.html', + '/layout/reftests/css-visited/color-on-link-1-ref.html', + '/layout/reftests/css-visited/color-on-link-1.html', + '/layout/reftests/css-visited/color-on-link-before-1.html', + '/layout/reftests/css-visited/color-on-text-decoration-1-ref.html', + '/layout/reftests/css-visited/color-on-text-decoration-1.html', + '/layout/reftests/css-visited/color-on-visited-1-ref.html', + '/layout/reftests/css-visited/color-on-visited-1.html', + '/layout/reftests/css-visited/color-on-visited-before-1.html', + '/layout/reftests/css-visited/column-rule-1-notref.html', + '/layout/reftests/css-visited/column-rule-1-ref.html', + '/layout/reftests/css-visited/column-rule-1.html', + '/layout/reftests/css-visited/content-before-1-ref.html', + '/layout/reftests/css-visited/content-color-on-link-before-1-ref.html', + '/layout/reftests/css-visited/content-color-on-link-before-1.html', + '/layout/reftests/css-visited/content-color-on-visited-before-1-ref.html', + '/layout/reftests/css-visited/content-color-on-visited-before-1.html', + '/layout/reftests/css-visited/content-on-link-before-1.html', + '/layout/reftests/css-visited/content-on-visited-before-1.html', + '/layout/reftests/css-visited/first-line-1-ref.html', + '/layout/reftests/css-visited/first-line-1.html', + '/layout/reftests/css-visited/inherit-keyword-1-ref.html', + '/layout/reftests/css-visited/inherit-keyword-1.xhtml', + '/layout/reftests/css-visited/link-root-1-ref.xhtml', + '/layout/reftests/css-visited/link-root-1.xhtml', + '/layout/reftests/css-visited/mathml-links-ref.html', + '/layout/reftests/css-visited/mathml-links.html', + '/layout/reftests/css-visited/outline-1-ref.html', + '/layout/reftests/css-visited/outline-1.html', + '/layout/reftests/css-visited/selector-adj-sibling-1-ref.html', + '/layout/reftests/css-visited/selector-adj-sibling-1.html', + '/layout/reftests/css-visited/selector-adj-sibling-2-ref.html', + '/layout/reftests/css-visited/selector-adj-sibling-2.html', + '/layout/reftests/css-visited/selector-any-sibling-1-ref.html', + '/layout/reftests/css-visited/selector-any-sibling-1.html', + '/layout/reftests/css-visited/selector-any-sibling-2-ref.html', + '/layout/reftests/css-visited/selector-any-sibling-2.html', + '/layout/reftests/css-visited/selector-child-1-ref.html', + '/layout/reftests/css-visited/selector-child-1.html', + '/layout/reftests/css-visited/selector-child-2-ref.xhtml', + '/layout/reftests/css-visited/selector-child-2.xhtml', + '/layout/reftests/css-visited/selector-descendant-1-ref.html', + '/layout/reftests/css-visited/selector-descendant-1.html', + '/layout/reftests/css-visited/selector-descendant-2-ref.xhtml', + '/layout/reftests/css-visited/selector-descendant-2.xhtml', + '/layout/reftests/css-visited/subject-of-selector-1-ref.html', + '/layout/reftests/css-visited/subject-of-selector-adj-sibling-1.html', + '/layout/reftests/css-visited/subject-of-selector-any-sibling-1.html', + '/layout/reftests/css-visited/subject-of-selector-child-1.html', + '/layout/reftests/css-visited/subject-of-selector-descendant-1.html', + '/layout/reftests/css-visited/subject-of-selector-descendant-2-ref.xhtml', + '/layout/reftests/css-visited/subject-of-selector-descendant-2.xhtml', + '/layout/reftests/css-visited/visited-page.html', + '/layout/reftests/css-visited/white-to-transparent-1-ref.html', + '/layout/reftests/css-visited/white-to-transparent-1.html', + '/layout/reftests/css-visited/width-1-ref.html', + '/layout/reftests/css-visited/width-on-link-1.html', + '/layout/reftests/css-visited/width-on-visited-1.html', + '/layout/reftests/svg/as-image/lime100x100.svg', + '/layout/reftests/svg/as-image/svg-image-visited-1-helper.svg', + '/layout/reftests/svg/as-image/svg-image-visited-2-helper.svg', + '/layout/reftests/svg/pseudo-classes-02-ref.svg', + '/layout/reftests/svg/pseudo-classes-02.svg', +] + DEFINES['MOZILLA_INTERNAL_API'] = True diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py index 887cf9d68eb..d70b8ec8f2a 100644 --- a/python/mozbuild/mozbuild/frontend/emitter.py +++ b/python/mozbuild/mozbuild/frontend/emitter.py @@ -1063,7 +1063,7 @@ class TreeMetadataEmitter(LoggingMixin): m = manifestparser.TestManifest(manifests=[path], strict=True, rootdir=context.config.topsrcdir) defaults = m.manifest_defaults[os.path.normpath(path)] - if not m.tests and not 'support-files' in defaults: + if not m.tests: raise SandboxValidationError('Empty test manifest: %s' % path, context) @@ -1162,10 +1162,6 @@ class TreeMetadataEmitter(LoggingMixin): process_support_files(test) - if not filtered: - # If there are no tests, look for support-files under DEFAULT. - process_support_files(defaults) - # We also copy manifests into the output directory, # including manifests from [include:foo] directives. for mpath in m.manifests(): diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-absolute-support/absolute-support.ini b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-absolute-support/absolute-support.ini index 441fe70bc13..900f4215848 100644 --- a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-absolute-support/absolute-support.ini +++ b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-absolute-support/absolute-support.ini @@ -1,2 +1,4 @@ [DEFAULT] support-files = /.well-known/foo.txt + +[test_file.js] diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-absolute-support/test_file.js b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-absolute-support/test_file.js new file mode 100644 index 00000000000..e69de29bb2d diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py index c4e02dd0303..58c4c1a505d 100644 --- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py +++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py @@ -376,15 +376,11 @@ class TestEmitterBasic(unittest.TestCase): def test_test_manifest_just_support_files(self): - """A test manifest with no tests but support-files is supported.""" + """A test manifest with no tests but support-files is not supported.""" reader = self.reader('test-manifest-just-support') - objs = self.read_topsrcdir(reader) - self.assertEqual(len(objs), 1) - o = objs[0] - self.assertEqual(len(o.installs), 2) - paths = sorted([k[len(o.directory)+1:] for k in o.installs.keys()]) - self.assertEqual(paths, ["foo.txt", "just-support.ini"]) + with self.assertRaisesRegexp(SandboxValidationError, 'Empty test manifest'): + self.read_topsrcdir(reader) def test_test_manifest_absolute_support_files(self): """Support files starting with '/' are placed relative to the install root""" @@ -393,10 +389,11 @@ class TestEmitterBasic(unittest.TestCase): objs = self.read_topsrcdir(reader) self.assertEqual(len(objs), 1) o = objs[0] - self.assertEqual(len(o.installs), 2) + self.assertEqual(len(o.installs), 3) expected = [ mozpath.normpath(mozpath.join(o.install_prefix, "../.well-known/foo.txt")), mozpath.join(o.install_prefix, "absolute-support.ini"), + mozpath.join(o.install_prefix, "test_file.js"), ] paths = sorted([v[0] for v in o.installs.values()]) self.assertEqual(paths, expected) diff --git a/testing/mochitest/MochiKit/mochitest.ini b/testing/mochitest/MochiKit/mochitest.ini deleted file mode 100644 index 8e09cca4035..00000000000 --- a/testing/mochitest/MochiKit/mochitest.ini +++ /dev/null @@ -1,23 +0,0 @@ -[DEFAULT] -skip-if = buildapp == 'b2g' -support-files = - /MochiKit/Async.js - /MochiKit/Base.js - /MochiKit/Color.js - /MochiKit/Controls.js - /MochiKit/DateTime.js - /MochiKit/DOM.js - /MochiKit/DragAndDrop.js - /MochiKit/Format.js - /MochiKit/Iter.js - /MochiKit/Logging.js - /MochiKit/LoggingPane.js - /MochiKit/MochiKit.js - /MochiKit/MockDOM.js - /MochiKit/New.js - /MochiKit/__package__.js - /MochiKit/Signal.js - /MochiKit/Sortable.js - /MochiKit/Style.js - /MochiKit/Test.js - /MochiKit/Visual.js diff --git a/testing/mochitest/dynamic/mochitest.ini b/testing/mochitest/dynamic/mochitest.ini deleted file mode 100644 index c2bfe8d3765..00000000000 --- a/testing/mochitest/dynamic/mochitest.ini +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] -skip-if = buildapp == 'b2g' -support-files = /dynamic/getMyDirectory.sjs diff --git a/testing/mochitest/moz.build b/testing/mochitest/moz.build index 743f514b463..ea1a8bb0da9 100644 --- a/testing/mochitest/moz.build +++ b/testing/mochitest/moz.build @@ -20,10 +20,6 @@ USE_EXTENSION_MANIFEST = True FINAL_TARGET_PP_FILES += ['install.rdf'] MOCHITEST_MANIFESTS += [ - 'dynamic/mochitest.ini', - 'MochiKit/mochitest.ini', - 'static/mochitest.ini', - 'tests/MochiKit-1.4.2/MochiKit/mochitest.ini', 'tests/MochiKit-1.4.2/tests/mochitest.ini', ] MOCHITEST_CHROME_MANIFESTS += ['chrome/chrome.ini'] @@ -99,3 +95,56 @@ TEST_HARNESS_FILES.testing.mochitest.pywebsocket.mod_pywebsocket.handshake += [ 'pywebsocket/mod_pywebsocket/handshake/hybi.py', 'pywebsocket/mod_pywebsocket/handshake/hybi00.py', ] + +TEST_HARNESS_FILES.testing.mochitest.dynamic += [ + 'dynamic/getMyDirectory.sjs', +] + +TEST_HARNESS_FILES.testing.mochitest.static += [ + 'static/harness.css', +] + +TEST_HARNESS_FILES.testing.mochitest.MochiKit += [ + 'MochiKit/__package__.js', + 'MochiKit/Async.js', + 'MochiKit/Base.js', + 'MochiKit/Color.js', + 'MochiKit/Controls.js', + 'MochiKit/DateTime.js', + 'MochiKit/DOM.js', + 'MochiKit/DragAndDrop.js', + 'MochiKit/Format.js', + 'MochiKit/Iter.js', + 'MochiKit/Logging.js', + 'MochiKit/LoggingPane.js', + 'MochiKit/MochiKit.js', + 'MochiKit/MockDOM.js', + 'MochiKit/New.js', + 'MochiKit/Signal.js', + 'MochiKit/Sortable.js', + 'MochiKit/Style.js', + 'MochiKit/Test.js', + 'MochiKit/Visual.js', +] + +TEST_HARNESS_FILES.testing.mochitest.tests.testing.mochitest.tests['MochiKit-1.4.2'].MochiKit += [ + 'tests/MochiKit-1.4.2/MochiKit/Async.js', + 'tests/MochiKit-1.4.2/MochiKit/Base.js', + 'tests/MochiKit-1.4.2/MochiKit/Color.js', + 'tests/MochiKit-1.4.2/MochiKit/DateTime.js', + 'tests/MochiKit-1.4.2/MochiKit/DOM.js', + 'tests/MochiKit-1.4.2/MochiKit/DragAndDrop.js', + 'tests/MochiKit-1.4.2/MochiKit/Format.js', + 'tests/MochiKit-1.4.2/MochiKit/Iter.js', + 'tests/MochiKit-1.4.2/MochiKit/Logging.js', + 'tests/MochiKit-1.4.2/MochiKit/LoggingPane.js', + 'tests/MochiKit-1.4.2/MochiKit/MochiKit.js', + 'tests/MochiKit-1.4.2/MochiKit/MockDOM.js', + 'tests/MochiKit-1.4.2/MochiKit/Position.js', + 'tests/MochiKit-1.4.2/MochiKit/Selector.js', + 'tests/MochiKit-1.4.2/MochiKit/Signal.js', + 'tests/MochiKit-1.4.2/MochiKit/Sortable.js', + 'tests/MochiKit-1.4.2/MochiKit/Style.js', + 'tests/MochiKit-1.4.2/MochiKit/Test.js', + 'tests/MochiKit-1.4.2/MochiKit/Visual.js', +] diff --git a/testing/mochitest/static/mochitest.ini b/testing/mochitest/static/mochitest.ini deleted file mode 100644 index 3326340eed8..00000000000 --- a/testing/mochitest/static/mochitest.ini +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] -skip-if = buildapp == 'b2g' -support-files = /static/harness.css \ No newline at end of file diff --git a/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/mochitest.ini b/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/mochitest.ini deleted file mode 100644 index f2a35f88f78..00000000000 --- a/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/mochitest.ini +++ /dev/null @@ -1,22 +0,0 @@ -[DEFAULT] -skip-if = buildapp == 'b2g' -support-files = - Async.js - Base.js - Color.js - DateTime.js - DOM.js - DragAndDrop.js - Format.js - Iter.js - Logging.js - LoggingPane.js - MochiKit.js - MockDOM.js - Position.js - Selector.js - Signal.js - Sortable.js - Style.js - Test.js - Visual.js \ No newline at end of file diff --git a/toolkit/components/jsdownloads/moz.build b/toolkit/components/jsdownloads/moz.build index 32e7ae79005..c469a0e9fae 100644 --- a/toolkit/components/jsdownloads/moz.build +++ b/toolkit/components/jsdownloads/moz.build @@ -9,5 +9,10 @@ with Files('*'): DIRS += ['public', 'src'] -XPCSHELL_TESTS_MANIFESTS += ['test/data/xpcshell.ini', 'test/unit/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini'] + +TEST_HARNESS_FILES.xpcshell.toolkit.components.jsdownloads.test.data += [ + 'test/data/empty.txt', + 'test/data/source.txt', +] diff --git a/toolkit/components/jsdownloads/test/data/xpcshell.ini b/toolkit/components/jsdownloads/test/data/xpcshell.ini deleted file mode 100644 index e9c376a8d81..00000000000 --- a/toolkit/components/jsdownloads/test/data/xpcshell.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -support-files = - empty.txt - source.txt - -# No tests, just data. diff --git a/toolkit/components/places/tests/browser/mochitest.ini b/toolkit/components/places/tests/browser/mochitest.ini deleted file mode 100644 index 4166272aac1..00000000000 --- a/toolkit/components/places/tests/browser/mochitest.ini +++ /dev/null @@ -1,20 +0,0 @@ -[DEFAULT] -skip-if = buildapp == 'b2g' -support-files = - 399606-httprefresh.html - 399606-location.reload.html - 399606-location.replace.html - 399606-window.location.href.html - 399606-window.location.html - 399606-history.go-0.html - redirect.sjs - redirect-target.html - title1.html - title2.html - begin.html - redirect_twice.sjs - redirect_once.sjs - final.html - favicon-normal16.png - favicon-normal32.png - favicon.html diff --git a/toolkit/components/places/tests/chrome/mochitest.ini b/toolkit/components/places/tests/chrome/mochitest.ini deleted file mode 100644 index bdada4019e6..00000000000 --- a/toolkit/components/places/tests/chrome/mochitest.ini +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] -skip-if = buildapp == 'b2g' -support-files = - sample_feed.atom - bad_links.atom - rss_as_html.rss - rss_as_html.rss^headers^ - link-less-items.rss - link-less-items-no-site-uri.rss diff --git a/toolkit/components/places/tests/mochitest.ini b/toolkit/components/places/tests/mochitest.ini deleted file mode 100644 index 52c71112b1a..00000000000 --- a/toolkit/components/places/tests/mochitest.ini +++ /dev/null @@ -1,3 +0,0 @@ -[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 deleted file mode 100644 index 73e5fc91bb4..00000000000 --- a/toolkit/components/places/tests/mochitest/bug_411966/mochitest.ini +++ /dev/null @@ -1,10 +0,0 @@ -[DEFAULT] -skip-if = buildapp == 'b2g' -support-files = - redirect.js - TypedPage.htm - ClickedPage.htm - ClickedPage.htm^headers^ - TempRedirectPage.htm - TempRedirectPage.htm^headers^ - PermRedirectPage.htm diff --git a/toolkit/components/places/tests/mochitest/bug_461710/mochitest.ini b/toolkit/components/places/tests/mochitest/bug_461710/mochitest.ini deleted file mode 100644 index 467faa191ba..00000000000 --- a/toolkit/components/places/tests/mochitest/bug_461710/mochitest.ini +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -skip-if = buildapp == 'b2g' -support-files = - visited_page.html - link_page.html - link_page-2.html - link_page-3.html - iframe.html diff --git a/toolkit/components/places/tests/moz.build b/toolkit/components/places/tests/moz.build index d4781e4d3c8..595f837a4a7 100644 --- a/toolkit/components/places/tests/moz.build +++ b/toolkit/components/places/tests/moz.build @@ -22,7 +22,6 @@ XPCSHELL_TESTS_MANIFESTS += [ 'queries/xpcshell.ini', 'unifiedcomplete/xpcshell.ini', 'unit/xpcshell.ini', - 'xpcshell.ini', ] BROWSER_CHROME_MANIFESTS += ['browser/browser.ini'] @@ -30,10 +29,59 @@ MOCHITEST_CHROME_MANIFESTS += [ 'chrome.ini', 'chrome/chrome.ini', ] -MOCHITEST_MANIFESTS += [ - 'browser/mochitest.ini', - 'chrome/mochitest.ini', - 'mochitest.ini', - 'mochitest/bug_411966/mochitest.ini', - 'mochitest/bug_461710/mochitest.ini', + +TEST_HARNESS_FILES.xpcshell.toolkit.components.places.tests += [ + 'head_common.js', ] + +TEST_HARNESS_FILES.testing.mochitest.tests.toolkit.components.places.tests.browser += [ + 'browser/399606-history.go-0.html', + 'browser/399606-httprefresh.html', + 'browser/399606-location.reload.html', + 'browser/399606-location.replace.html', + 'browser/399606-window.location.href.html', + 'browser/399606-window.location.html', + 'browser/begin.html', + 'browser/favicon-normal16.png', + 'browser/favicon-normal32.png', + 'browser/favicon.html', + 'browser/final.html', + 'browser/redirect-target.html', + 'browser/redirect.sjs', + 'browser/redirect_once.sjs', + 'browser/redirect_twice.sjs', + 'browser/title1.html', + 'browser/title2.html', +] + +TEST_HARNESS_FILES.testing.mochitest.tests.toolkit.components.places.tests.chrome += [ + 'chrome/bad_links.atom', + 'chrome/link-less-items-no-site-uri.rss', + 'chrome/link-less-items.rss', + 'chrome/rss_as_html.rss', + 'chrome/rss_as_html.rss^headers^', + 'chrome/sample_feed.atom', +] + +TEST_HARNESS_FILES.testing.mochitest.tests.toolkit.components.places.tests += [ + 'bug94514-postpage.html', +] + +TEST_HARNESS_FILES.testing.mochitest.tests.toolkit.components.places.tests.mochitest.bug_411966 += [ + 'mochitest/bug_411966/ClickedPage.htm', + 'mochitest/bug_411966/ClickedPage.htm^headers^', + 'mochitest/bug_411966/PermRedirectPage.htm', + 'mochitest/bug_411966/redirect.js', + 'mochitest/bug_411966/TempRedirectPage.htm', + 'mochitest/bug_411966/TempRedirectPage.htm^headers^', + 'mochitest/bug_411966/TypedPage.htm', +] + +TEST_HARNESS_FILES.testing.mochitest.tests.toolkit.components.places.tests.mochitest.bug_461710 += [ + 'mochitest/bug_461710/iframe.html', + 'mochitest/bug_461710/link_page-2.html', + 'mochitest/bug_461710/link_page-3.html', + 'mochitest/bug_461710/link_page.html', + 'mochitest/bug_461710/visited_page.html', +] + diff --git a/toolkit/components/places/tests/xpcshell.ini b/toolkit/components/places/tests/xpcshell.ini deleted file mode 100644 index e81bb6c5639..00000000000 --- a/toolkit/components/places/tests/xpcshell.ini +++ /dev/null @@ -1,2 +0,0 @@ -[DEFAULT] -support-files = head_common.js