Bug 883114 - Part a: remove various make rules in dom; r=ted

This commit is contained in:
Ms2ger 2013-07-01 09:01:23 +02:00
parent 4006ded057
commit b5ea9cce84
7 changed files with 63 additions and 52 deletions

View File

@ -10,8 +10,7 @@ relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
TEST_FILES = \
MOCHITEST_FILES := \
test_ipc.html \
../test/devicestorage_common.js \
$(NULL)
@ -20,7 +19,3 @@ TEST_FILES = \
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
libs:: $(TEST_FILES)
$(INSTALL) $(foreach f,$^,"$f") \
$(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)\

View File

@ -2,7 +2,7 @@
# 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/.
DEPTH = ../../..
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
@ -11,9 +11,7 @@ relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_TEST_FILES = \
MOCHITEST_FILES = \
test_permission_basics.html \
test_alarms.html \
test_idle.html \
@ -30,19 +28,19 @@ _TEST_FILES = \
$(NULL)
# disabled until bug 859593 is fixed
#_TEST_FILES += \
#MOCHITEST_FILES += \
# test_camera.html \
# $(NULL)
ifdef MOZ_B2G
_TEST_FILES += \
MOCHITEST_FILES += \
test_keyboard.html \
test_wifi-manage.html \
$(NULL)
endif
ifdef MOZ_B2G_RIL
_TEST_FILES += \
MOCHITEST_FILES += \
test_cellbroadcast.html \
test_mobileconnection.html \
test_networkstats-manage.html \
@ -52,31 +50,27 @@ _TEST_FILES += \
endif
ifdef MOZ_B2G_FM
_TEST_FILES += \
MOCHITEST_FILES += \
test_fmradio.html \
$(NULL)
endif
ifdef MOZ_B2G_BT
_TEST_FILES += \
MOCHITEST_FILES += \
test_bluetooth.html \
$(NULL)
endif
ifdef MOZ_WEBSMS_BACKEND
_TEST_FILES += \
MOCHITEST_FILES += \
test_sms.html \
$(NULL)
endif
ifdef MOZ_TIME_MANAGER
_TEST_FILES += \
MOCHITEST_FILES += \
test_time.html \
$(NULL)
endif
_CHROME_TEST_FILES = \
$(NULL)
libs:: $(_TEST_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -1,25 +1,27 @@
# 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/.
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_TEST_FILES = \
test_getRandomValues.html \
$(NULL)
ifndef MOZ_DISABLE_CRYPTOLEGACY
_TEST_FILES += test_legacy.html
else
_TEST_FILES += test_no_legacy.html
endif
libs:: $(_TEST_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
# You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_FILES := \
test_getRandomValues.html \
$(NULL)
ifndef MOZ_DISABLE_CRYPTOLEGACY
MOCHITEST_FILES += \
test_legacy.html \
$(NULL)
else
MOCHITEST_FILES += \
test_no_legacy.html \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk

View File

@ -1,4 +1,3 @@
#
# 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/.
@ -219,10 +218,5 @@ MOCHITEST_FILES = \
xhtml1-strict.dtd \
xhtml1-transitional.dtd \
$(NULL)
MOCHITEST_FILES_J = \
applets/org/w3c/domts/DOMTSApplet.class \
$(NULL)
include $(topsrcdir)/config/rules.mk
libs:: $(MOCHITEST_FILES_J)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)/applets/org/w3c/domts
include $(topsrcdir)/config/rules.mk

View File

@ -0,0 +1,17 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_FILES := \
DOMTSApplet.class \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -0,0 +1,6 @@
# -*- 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/.

View File

@ -4,3 +4,6 @@
# 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 += [
'applets/org/w3c/domts',
]