Bug 943728 - Convert several resource install using double quotes to INSTALL_TARGETS and editor/libeditor/html/tests to mochitest manifest. r=gps,r=mshal

This commit is contained in:
Mike Hommey 2013-12-03 06:34:21 +09:00
parent b180afe08c
commit af0a0ac41d
15 changed files with 116 additions and 115 deletions

View File

@ -2,9 +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/.
include $(topsrcdir)/config/rules.mk
_SUPPORT_FILES = \
SUPPORT_FILES = \
testharness.js \
testharnessreport.js \
testharness.css \
@ -12,5 +10,5 @@ _SUPPORT_FILES = \
WebIDLParser.js \
$(NULL)
libs:: $(_SUPPORT_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/resources
SUPPORT_DEST = $(DEPTH)/_tests/testing/mochitest/resources
INSTALL_TARGETS += SUPPORT

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/.
_DATA_FILES = \
data/cfhtml-chromium.txt \
data/cfhtml-firefox.txt \
data/cfhtml-ie.txt \
data/cfhtml-ooo.txt \
data/cfhtml-nocontext.txt \
$(NULL)
include $(topsrcdir)/config/rules.mk
libs::
(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - browserscope 2> /dev/null) | (cd $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) && tar -xf -)
libs:: $(_DATA_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)/data

View File

@ -1,5 +1,63 @@
[DEFAULT]
support-files =
browserscope/test_richtext2.html
browserscope/test_richtext.html
browserscope/lib/richtext2/current_revision
browserscope/lib/richtext2/richtext2/common.py
browserscope/lib/richtext2/richtext2/unittestexample.html
browserscope/lib/richtext2/richtext2/static/editable-dM.html
browserscope/lib/richtext2/richtext2/static/editable.css
browserscope/lib/richtext2/richtext2/static/editable-body.html
browserscope/lib/richtext2/richtext2/static/editable-div.html
browserscope/lib/richtext2/richtext2/static/js/variables.js
browserscope/lib/richtext2/richtext2/static/js/range-bootstrap.js
browserscope/lib/richtext2/richtext2/static/js/range.js
browserscope/lib/richtext2/richtext2/static/js/output.js
browserscope/lib/richtext2/richtext2/static/js/compare.js
browserscope/lib/richtext2/richtext2/static/js/canonicalize.js
browserscope/lib/richtext2/richtext2/static/js/pad.js
browserscope/lib/richtext2/richtext2/static/js/run.js
browserscope/lib/richtext2/richtext2/static/js/units.js
browserscope/lib/richtext2/richtext2/static/common.css
browserscope/lib/richtext2/richtext2/__init__.py
browserscope/lib/richtext2/richtext2/handlers.py
browserscope/lib/richtext2/richtext2/templates/output.html
browserscope/lib/richtext2/richtext2/templates/richtext2.html
browserscope/lib/richtext2/richtext2/tests/forwarddelete.py
browserscope/lib/richtext2/richtext2/tests/selection.py
browserscope/lib/richtext2/richtext2/tests/queryIndeterm.py
browserscope/lib/richtext2/richtext2/tests/unapplyCSS.py
browserscope/lib/richtext2/richtext2/tests/apply.py
browserscope/lib/richtext2/richtext2/tests/unapply.py
browserscope/lib/richtext2/richtext2/tests/change.py
browserscope/lib/richtext2/richtext2/tests/queryState.py
browserscope/lib/richtext2/richtext2/tests/queryValue.py
browserscope/lib/richtext2/richtext2/tests/__init__.py
browserscope/lib/richtext2/richtext2/tests/insert.py
browserscope/lib/richtext2/richtext2/tests/queryEnabled.py
browserscope/lib/richtext2/richtext2/tests/applyCSS.py
browserscope/lib/richtext2/richtext2/tests/changeCSS.py
browserscope/lib/richtext2/richtext2/tests/delete.py
browserscope/lib/richtext2/richtext2/tests/querySupported.py
browserscope/lib/richtext2/README
browserscope/lib/richtext2/update_from_upstream
browserscope/lib/richtext2/LICENSE
browserscope/lib/richtext2/README.Mozilla
browserscope/lib/richtext2/currentStatus.js
browserscope/lib/richtext/current_revision
browserscope/lib/richtext/README
browserscope/lib/richtext/update_from_upstream
browserscope/lib/richtext/LICENSE
browserscope/lib/richtext/README.Mozilla
browserscope/lib/richtext/richtext/editable.html
browserscope/lib/richtext/richtext/richtext.html
browserscope/lib/richtext/richtext/js/range.js
browserscope/lib/richtext/currentStatus.js
data/cfhtml-chromium.txt
data/cfhtml-firefox.txt
data/cfhtml-ie.txt
data/cfhtml-ooo.txt
data/cfhtml-nocontext.txt
file_bug549262.html
file_bug674770-1.html
file_select_all_without_body.html

View File

@ -10,14 +10,8 @@ DIST_FILES = install.rdf
# Used in install.rdf
USE_EXTENSION_MANIFEST = 1
include $(topsrcdir)/config/rules.mk
# We're installing to _tests/testing/mochitest, so this is the depth
# necessary for relative objdir paths.
TARGET_DEPTH = ../../..
include $(topsrcdir)/build/automation-build.mk
# files that get copied into $objdir/_tests/
_SERV_FILES = \
SERV_FILES = \
runtests.py \
automation.py \
runtestsb2g.py \
@ -58,17 +52,23 @@ _SERV_FILES = \
$(NULL)
ifeq ($(MOZ_BUILD_APP),mobile/android)
_SERV_FILES += \
SERV_FILES += \
$(topsrcdir)/mobile/android/base/tests/robocop.ini \
$(topsrcdir)/mobile/android/base/tests/robocop_autophone.ini \
$(NULL)
endif
_PYWEBSOCKET_FILES = \
_DEST_DIR = $(DEPTH)/_tests/$(relativesrcdir)
SERV_DEST = $(_DEST_DIR)
INSTALL_TARGETS += SERV
PYWEBSOCKET_FILES = \
pywebsocket/standalone.py \
$(NULL)
PYWEBSOCKET_DEST = $(_DEST_DIR)/pywebsocket
INSTALL_TARGETS += PYWEBSOCKET
_MOD_PYWEBSOCKET_FILES = \
MOD_PYWEBSOCKET_FILES = \
pywebsocket/mod_pywebsocket/__init__.py \
pywebsocket/mod_pywebsocket/common.py \
pywebsocket/mod_pywebsocket/dispatch.py \
@ -83,32 +83,28 @@ _MOD_PYWEBSOCKET_FILES = \
pywebsocket/mod_pywebsocket/_stream_hybi.py \
pywebsocket/mod_pywebsocket/_stream_base.py \
$(NULL)
MOD_PYWEBSOCKET_DEST = $(_DEST_DIR)/pywebsocket/mod_pywebsocket
INSTALL_TARGETS += MOD_PYWEBSOCKET
_HANDSHAKE_FILES = \
HANDSHAKE_FILES = \
pywebsocket/mod_pywebsocket/handshake/__init__.py \
pywebsocket/mod_pywebsocket/handshake/hybi00.py \
pywebsocket/mod_pywebsocket/handshake/_base.py \
pywebsocket/mod_pywebsocket/handshake/draft75.py \
pywebsocket/mod_pywebsocket/handshake/hybi.py \
$(NULL)
HANDSHAKE_DEST = $(_DEST_DIR)/pywebsocket/mod_pywebsocket/handshake
INSTALL_TARGETS += HANDSHAKE
_DEST_DIR = $(DEPTH)/_tests/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk
# We're installing to _tests/testing/mochitest, so this is the depth
# necessary for relative objdir paths.
TARGET_DEPTH = ../../..
include $(topsrcdir)/build/automation-build.mk
libs::
(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - mochijar) | (cd $(_DEST_DIR) && tar -xf -)
libs:: $(_PYWEBSOCKET_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(_DEST_DIR)/pywebsocket
libs:: $(_MOD_PYWEBSOCKET_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(_DEST_DIR)/pywebsocket/mod_pywebsocket
libs:: $(_HANDSHAKE_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(_DEST_DIR)/pywebsocket/mod_pywebsocket/handshake
libs:: $(_SERV_FILES)
$(INSTALL) $^ $(_DEST_DIR)
# Binaries and scripts that don't get packaged with the build,
# but that we need for the test harness
TEST_HARNESS_BINS := \

View File

@ -3,9 +3,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/.
include $(topsrcdir)/config/rules.mk
_JS_FILES = Async.js \
JS_FILES = Async.js \
Base.js \
Color.js \
Controls.js \
@ -26,6 +24,5 @@ _JS_FILES = Async.js \
Test.js \
Visual.js \
$(NULL)
libs:: $(_JS_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir)
JS_DEST = $(DEPTH)/_tests/$(relativesrcdir)
INSTALL_TARGETS += JS

View File

@ -3,11 +3,8 @@
# 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 $(topsrcdir)/config/rules.mk
_STATIC_FILES = \
STATIC_FILES = \
getMyDirectory.sjs \
$(NULL)
libs:: $(_STATIC_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir)
STATIC_DEST = $(DEPTH)/_tests/$(relativesrcdir)
INSTALL_TARGETS += STATIC

View File

@ -12,19 +12,18 @@ TESTPATH = $(topsrcdir)/mobile/android/base/tests/roboextender
include $(DEPTH)/config/autoconf.mk
_TEST_FILES = \
TEST_EXTENSIONS_DIR = $(DEPTH)/_tests/testing/mochitest/extensions
TEST_FILES = \
bootstrap.js \
install.rdf \
chrome.manifest \
$(NULL)
TEST_EXTENSIONS_DIR = $(DEPTH)/_tests/testing/mochitest/extensions
TEST_DEST = $(TEST_EXTENSIONS_DIR)/roboextender@mozilla.org/
INSTALL_TARGETS += TEST
include $(topsrcdir)/config/rules.mk
libs:: $(_TEST_FILES)
$(MKDIR) -p $(TEST_EXTENSIONS_DIR)/roboextender@mozilla.org
$(INSTALL) $(foreach f,$^,"$f") $(TEST_EXTENSIONS_DIR)/roboextender@mozilla.org/
$(MKDIR) -p $(TEST_EXTENSIONS_DIR)/roboextender@mozilla.org/base
$(MKDIR) -p $(TESTPATH)
-cp $(TESTPATH)/* $(TEST_EXTENSIONS_DIR)/roboextender@mozilla.org/base

View File

@ -3,13 +3,10 @@
# 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 $(topsrcdir)/config/rules.mk
_STATIC_FILES = test.template.txt \
STATIC_FILES = test.template.txt \
xhtml.template.txt \
xul.template.txt \
harness.css \
$(NULL)
libs:: $(_STATIC_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir)
STATIC_DEST = $(DEPTH)/_tests/$(relativesrcdir)
INSTALL_TARGETS += STATIC

View File

@ -3,9 +3,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/.
include $(topsrcdir)/config/rules.mk
_TEST_FILES = \
TEST_FILES = \
test_sanity.html \
test_sanityException.html \
test_sanityException2.html \
@ -24,8 +22,7 @@ _TEST_FILES = \
test_sanityEventUtils.html \
test_sanitySimpletest.html \
$(NULL)
# Copy the sanity tests into a subdirectory, so the top level is all dirs
# in the test screen.
libs:: $(_TEST_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir)/Harness_sanity
TEST_DEST = $(DEPTH)/_tests/$(relativesrcdir)/Harness_sanity
INSTALL_TARGETS += TEST

View File

@ -3,10 +3,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/.
include $(topsrcdir)/config/rules.mk
_MOCHIKIT_FILES = \
MOCHIKIT_FILES = \
Async.js \
Base.js \
Color.js \
@ -28,5 +25,5 @@ _MOCHIKIT_FILES = \
Visual.js \
$(NULL)
libs:: $(_MOCHIKIT_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir)
MOCHIKIT_DEST = $(DEPTH)/_tests/$(relativesrcdir)
INSTALL_TARGETS += MOCHIKIT

View File

@ -3,10 +3,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/.
include $(topsrcdir)/config/rules.mk
_TEST_FILES = \
TEST_FILES = \
test_Base.js \
test_Color.js \
test_DateTime.js \
@ -37,5 +34,5 @@ _TEST_FILES = \
# (And is removed in future MochiKit v1.5)
# test_MochiKit-JSAN.html \
libs:: $(_TEST_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir)
TEST_DEST = $(DEPTH)/_tests/$(relativesrcdir)
INSTALL_TARGETS += TEST

View File

@ -7,12 +7,8 @@
#
# We want to run the tests in our own (modified) harness.
#
include $(topsrcdir)/config/rules.mk
_STUBS_FILES = \
STUBS_FILES = \
test.css \
$(NULL)
libs:: $(_STUBS_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir)
STUBS_DEST = $(DEPTH)/_tests/$(relativesrcdir)
INSTALL_TARGETS += STUBS

View File

@ -2,8 +2,7 @@
# 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 $(topsrcdir)/config/rules.mk
_SIMPLETEST_FILES = LogController.js \
SIMPLETEST_FILES = LogController.js \
SimpleTest.js \
test.css \
TestRunner.js \
@ -19,6 +18,5 @@ _SIMPLETEST_FILES = LogController.js \
$(DEPTH)/testing/specialpowers/content/MozillaLogger.js \
$(DEPTH)/docshell/test/chrome/docshell_helpers.js \
$(NULL)
libs:: $(_SIMPLETEST_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir)
SIMPLETEST_DEST = $(DEPTH)/_tests/$(relativesrcdir)
INSTALL_TARGETS += SIMPLETEST

View File

@ -1,12 +1,9 @@
# Any copyright is dedicated to the Public Domain.
# http://creativecommons.org/publicdomain/zero/1.0/
FILES = \
TEST_FILES = \
empty.txt \
source.txt \
$(NULL)
include $(topsrcdir)/config/rules.mk
libs:: $(FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/xpcshell/$(relativesrcdir)
TEST_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)
INSTALL_TARGETS += TEST

View File

@ -3,9 +3,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# Files in the main "tests" folder.
XPCSHELL_TESTS_COMMON = \
XPCSHELL_TESTS_COMMON_FILES = \
head_common.js \
$(NULL)
XPCSHELL_TESTS_COMMON_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)
INSTALL_TARGETS += XPCSHELL_TESTS_COMMON
# Simple MochiTests
MOCHITEST_FILES = \
@ -17,8 +19,3 @@ MOCHITEST_CHROME_FILES = \
mochitest/test_bug_411966.html \
mochitest/test_bug_461710_perwindowpb.html \
$(NULL)
include $(topsrcdir)/config/rules.mk
libs:: $(XPCSHELL_TESTS_COMMON)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/xpcshell/$(relativesrcdir)