Bug 1012621 - Part 2: Move xpcshell related files into test/xpcshell sub-folder. r=vyang,khuey
authorBevis Tseng <btseng@mozilla.com>
Tue, 03 Jun 2014 11:17:05 +0800
changeset 199241 dfeac9b450c2f55d4d978e4a6ea27a5b6e7fdd20
parent 199240 e885df692af33bd4265a2f5406e5db82bee52b1f
child 199242 c6bf6c65c913bf4a7d567610ea415c25d523d064
push idunknown
push userunknown
push dateunknown
reviewersvyang, khuey
bugs1012621
milestone32.0a1
Bug 1012621 - Part 2: Move xpcshell related files into test/xpcshell sub-folder. r=vyang,khuey
dom/mobilemessage/moz.build
dom/mobilemessage/tests/header_helpers.js
dom/mobilemessage/tests/moz.build
dom/mobilemessage/tests/test_mms_pdu_helper.js
dom/mobilemessage/tests/test_mms_service.js
dom/mobilemessage/tests/test_smsservice_createsmsmessage.js
dom/mobilemessage/tests/test_wsp_pdu_helper.js
dom/mobilemessage/tests/xpcshell.ini
dom/mobilemessage/tests/xpcshell/header_helpers.js
dom/mobilemessage/tests/xpcshell/test_mms_pdu_helper.js
dom/mobilemessage/tests/xpcshell/test_mms_service.js
dom/mobilemessage/tests/xpcshell/test_smsservice_createsmsmessage.js
dom/mobilemessage/tests/xpcshell/test_wsp_pdu_helper.js
dom/mobilemessage/tests/xpcshell/xpcshell.ini
testing/xpcshell/xpcshell_android.ini
testing/xpcshell/xpcshell_b2g.ini
--- a/dom/mobilemessage/moz.build
+++ b/dom/mobilemessage/moz.build
@@ -2,10 +2,8 @@
 # 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/.
 
 DIRS += ['interfaces', 'src']
 TEST_DIRS += ['tests']
 
-if CONFIG['ENABLE_TESTS']:
-    XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
--- a/dom/mobilemessage/tests/moz.build
+++ b/dom/mobilemessage/tests/moz.build
@@ -1,8 +1,11 @@
 # -*- 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_MANIFESTS += ['mochitest/mochitest.ini']
 
+if CONFIG['ENABLE_TESTS']:
+        XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
+
rename from dom/mobilemessage/tests/header_helpers.js
rename to dom/mobilemessage/tests/xpcshell/header_helpers.js
rename from dom/mobilemessage/tests/test_mms_pdu_helper.js
rename to dom/mobilemessage/tests/xpcshell/test_mms_pdu_helper.js
rename from dom/mobilemessage/tests/test_mms_service.js
rename to dom/mobilemessage/tests/xpcshell/test_mms_service.js
rename from dom/mobilemessage/tests/test_smsservice_createsmsmessage.js
rename to dom/mobilemessage/tests/xpcshell/test_smsservice_createsmsmessage.js
rename from dom/mobilemessage/tests/test_wsp_pdu_helper.js
rename to dom/mobilemessage/tests/xpcshell/test_wsp_pdu_helper.js
rename from dom/mobilemessage/tests/xpcshell.ini
rename to dom/mobilemessage/tests/xpcshell/xpcshell.ini
--- a/testing/xpcshell/xpcshell_android.ini
+++ b/testing/xpcshell/xpcshell_android.ini
@@ -7,17 +7,17 @@
 [include:intl/locale/tests/unit/xpcshell.ini]
 [include:netwerk/cookie/test/unit/xpcshell.ini]
 [include:modules/libjar/zipwriter/test/unit/xpcshell.ini]
 [include:parser/xml/test/unit/xpcshell.ini]
 [include:image/test/unit/xpcshell.ini]
 [include:dom/activities/tests/unit/xpcshell.ini]
 [include:dom/apps/tests/unit/xpcshell.ini]
 [include:dom/encoding/test/unit/xpcshell.ini]
-[include:dom/mobilemessage/tests/xpcshell.ini]
+[include:dom/mobilemessage/tests/xpcshell/xpcshell.ini]
 [include:dom/network/tests/unit/xpcshell.ini]
 [include:dom/payment/tests/unit/xpcshell.ini]
 [include:dom/permission/tests/unit/xpcshell.ini]
 [include:dom/src/json/test/unit/xpcshell.ini]
 [include:dom/tests/unit/xpcshell.ini]
 [include:dom/indexedDB/test/unit/xpcshell.ini]
 [include:embedding/tests/unit/xpcshell.ini]
 [include:toolkit/components/downloads/test/schema_migration/xpcshell.ini]
--- a/testing/xpcshell/xpcshell_b2g.ini
+++ b/testing/xpcshell/xpcshell_b2g.ini
@@ -1,14 +1,14 @@
 ; 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/.
 
 [include:dom/apps/tests/unit/xpcshell.ini]
-[include:dom/mobilemessage/tests/xpcshell.ini]
+[include:dom/mobilemessage/tests/xpcshell/xpcshell.ini]
 [include:dom/network/tests/unit_stats/xpcshell.ini]
 [include:dom/system/gonk/tests/xpcshell.ini]
 [include:dom/wappush/tests/xpcshell.ini]
 [include:toolkit/components/osfile/tests/xpcshell/xpcshell.ini]
 [include:toolkit/components/captivedetect/test/unit/xpcshell.ini]
 [include:toolkit/devtools/apps/tests/unit/xpcshell.ini]
 [include:toolkit/devtools/debugger/tests/unit/xpcshell.ini]
 [include:toolkit/devtools/qrcode/tests/unit/xpcshell.ini]