Bug 925887 - Part b: move mochitests in content/xul/templates into manifests; r=jst

This commit is contained in:
Ms2ger 2013-11-28 15:03:16 +01:00
parent f90b2bde84
commit 49d53d9575
4 changed files with 6 additions and 26 deletions

View File

@ -5,5 +5,5 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PARALLEL_DIRS += ['public', 'src']
TEST_TOOL_DIRS += ['tests/chrome']
MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']

View File

@ -1,17 +0,0 @@
#
# 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/.
# NOTE: it is important that the first test of the test_tmpl_* tests here use
# datasources="rdf:null" to ensure that the real animals.rdf datasource
# can be synchronously loaded before the tests run.
# bugs 742455 and 823470
ifneq ($(OS_ARCH),WINNT)
MOCHITEST_CHROME_FILES += \
test_bug330010.xul \
file_bug330010.rdf \
$(NULL)
endif
# test_bug397148.xul is disabled because it leaks. See bug 879531.

View File

@ -8,6 +8,11 @@ support-files =
templates_shared.js
[test_bug329335.xul]
[test_bug330010.xul]
skip-if = os == "win"
support-files = file_bug330010.rdf
[test_bug397148.xul]
skip-if = true # Bug 879531
[test_bug441785.xul]
[test_bug476634.xul]
[test_sortservice.xul]

View File

@ -1,8 +0,0 @@
# -*- 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_CHROME_MANIFESTS += ['chrome.ini']