Backout f5d6b3af4966 (bug 1103825) for suspected test bustage

This commit is contained in:
Gregory Szorc 2014-11-25 18:08:36 -08:00
Родитель cff551e7b7
Коммит d72608f07b
2 изменённых файлов: 7 добавлений и 10 удалений

Просмотреть файл

@ -1,17 +1,15 @@
# This Source Code Form is subject to the terms of the Mozilla Public # 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 # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
MOCHITEST_PROFILE_FILES = \
mochitest_profile_FILES := \
prefs_general.js \ prefs_general.js \
prefs_b2g_unittest.js \ prefs_b2g_unittest.js \
webapps_mochitest.json \ webapps_mochitest.json \
$(NULL) $(NULL)
mochitest_profile_DEST = $(DEPTH)/_tests/testing/mochitest/profile_data WPT_PROFILE_FILES = $(MOCHITEST_PROFILE_FILES)
mochitest_profile_TARGET := misc
INSTALL_TARGETS += mochitest_profile
wpt_profile_FILES = $(MOCHITEST_PROFILE_FILES) MOCHITEST_PROFILE_DEST = $(DEPTH)/_tests/testing/mochitest/profile_data
wpt_profile_DEST = $(DEPTH)/_tests/web-platform/prefs WPT_PROFILE_DEST = $(DEPTH)/_tests/web-platform/prefs
wpt_profile_TARGET := misc
INSTALL_TARGETS += wpt_profile INSTALL_TARGETS += MOCHITEST_PROFILE
INSTALL_TARGETS += WPT_PROFILE

Просмотреть файл

@ -3,4 +3,3 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
HAS_MISC_RULE = True