Bug 1109831 - move testing/profiles/ files to moz.build's TEST_HARNESS_FILES; r=mshal
authorNathan Froyd <froydnj@mozilla.com>
Wed, 10 Dec 2014 13:58:51 -0500
changeset 246911 b7d6bbed77626a2d248b257e80140e8e0fb1f260
parent 246910 688b047708527e7a6ef2c114828b1d0a210809c0
child 246912 a1dc036c5fdb9c9c3a76ac90e994310c49d0c9c5
push id698
push userjlund@mozilla.com
push dateMon, 23 Mar 2015 22:08:11 +0000
treeherdermozilla-release@b0c0ae7b02a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1109831
milestone37.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 1109831 - move testing/profiles/ files to moz.build's TEST_HARNESS_FILES; r=mshal
testing/profiles/Makefile.in
testing/profiles/moz.build
deleted file mode 100644
--- a/testing/profiles/Makefile.in
+++ /dev/null
@@ -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
--- a/testing/profiles/moz.build
+++ b/testing/profiles/moz.build
@@ -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