Bug 1109831 - move testing/profiles/ files to moz.build's TEST_HARNESS_FILES; r=mshal

This commit is contained in:
Nathan Froyd 2014-12-10 13:58:51 -05:00
parent 799a81bce4
commit 4567a4f60e
2 changed files with 9 additions and 15 deletions

View File

@ -1,15 +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/.
MOCHITEST_PROFILE_FILES = \
prefs_general.js \
prefs_b2g_unittest.js \
webapps_mochitest.json \
$(NULL)
WPT_PROFILE_FILES = $(MOCHITEST_PROFILE_FILES)
MOCHITEST_PROFILE_DEST = $(DEPTH)/_tests/testing/mochitest/profile_data
WPT_PROFILE_DEST = $(DEPTH)/_tests/web-platform/prefs
INSTALL_TARGETS += MOCHITEST_PROFILE
INSTALL_TARGETS += WPT_PROFILE

View File

@ -1,5 +1,14 @@
# -*- 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_profile_files = [
'prefs_b2g_unittest.js',
'prefs_general.js',
'webapps_mochitest.json',
]
TEST_HARNESS_FILES.testing.mochitest.profile_data += mochitest_profile_files
TEST_HARNESS_FILES['web-platform'].prefs += mochitest_profile_files