Bug 939048 - Part a: Move mochitests to manifests in dom/network; r=jst

This commit is contained in:
Ms2ger 2013-12-31 10:06:10 +01:00
parent 79d800b0a8
commit 277894a69f
3 changed files with 20 additions and 20 deletions

View File

@ -1,20 +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_FILES = \
test_network_basics.html \
test_tcpsocket_default_permissions.html \
test_tcpsocket_enabled_no_perm.html \
test_tcpsocket_enabled_with_perm.html \
$(NULL)
ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
MOCHITEST_FILES = \
test_networkstats_basics.html \
test_networkstats_disabled.html \
test_networkstats_enabled_no_perm.html \
test_networkstats_enabled_perm.html \
test_networkstats_alarms.html \
$(NULL)
endif

View File

@ -0,0 +1,18 @@
[test_network_basics.html]
skip-if = toolkit == "gonk"
[test_tcpsocket_default_permissions.html]
skip-if = toolkit == "gonk"
[test_tcpsocket_enabled_no_perm.html]
skip-if = toolkit == "gonk"
[test_tcpsocket_enabled_with_perm.html]
skip-if = toolkit == "gonk"
[test_networkstats_alarms.html]
skip-if = toolkit != "gonk"
[test_networkstats_basics.html]
skip-if = toolkit != "gonk"
[test_networkstats_disabled.html]
skip-if = toolkit != "gonk"
[test_networkstats_enabled_no_perm.html]
skip-if = toolkit != "gonk"
[test_networkstats_enabled_perm.html]
skip-if = toolkit != "gonk"

View File

@ -8,3 +8,5 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini', 'unit_ipc/xpcshell.ini']
if CONFIG['MOZ_B2G_RIL']:
XPCSHELL_TESTS_MANIFESTS += ['unit_stats/xpcshell.ini']
MOCHITEST_MANIFESTS += ['mochitest.ini']