From 0d9d430864f2f9f963f656d82858ee2f61d60058 Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Mon, 25 Feb 2013 13:05:39 -0800 Subject: [PATCH] =?UTF-8?q?Bug=20784841=20-=20Part=2018=CE=B7:=20Convert?= =?UTF-8?q?=20/testing;=20r=3Dted?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- testing/gtest/moz.build | 5 +++++ testing/marionette/Makefile.in | 6 ------ testing/marionette/atoms/moz.build | 5 +++++ testing/marionette/components/moz.build | 5 +++++ testing/marionette/moz.build | 7 +++++++ testing/mochitest/Makefile.in | 13 ------------- testing/mochitest/MochiKit/moz.build | 5 +++++ testing/mochitest/chrome/moz.build | 5 +++++ testing/mochitest/dynamic/moz.build | 5 +++++ testing/mochitest/moz.build | 16 ++++++++++++++++ testing/mochitest/roboextender/moz.build | 5 +++++ testing/mochitest/ssltunnel/moz.build | 5 +++++ testing/mochitest/static/moz.build | 5 +++++ testing/mochitest/tests/Makefile.in | 6 ------ .../mochitest/tests/MochiKit-1.4.2/Makefile.in | 6 ------ .../tests/MochiKit-1.4.2/MochiKit/moz.build | 5 +++++ testing/mochitest/tests/MochiKit-1.4.2/moz.build | 6 ++++++ .../tests/MochiKit-1.4.2/tests/Makefile.in | 4 ---- .../MochiKit-1.4.2/tests/SimpleTest/moz.build | 5 +++++ .../tests/MochiKit-1.4.2/tests/moz.build | 6 ++++++ testing/mochitest/tests/SimpleTest/moz.build | 5 +++++ testing/mochitest/tests/browser/moz.build | 5 +++++ testing/mochitest/tests/moz.build | 10 ++++++++++ testing/modules/moz.build | 5 +++++ testing/mozbase/moz.build | 5 +++++ testing/peptest/moz.build | 5 +++++ testing/specialpowers/moz.build | 5 +++++ testing/tools/screenshot/moz.build | 5 +++++ testing/xpcshell/Makefile.in | 4 ---- testing/xpcshell/example/moz.build | 5 +++++ testing/xpcshell/moz.build | 6 ++++++ 31 files changed, 146 insertions(+), 39 deletions(-) create mode 100644 testing/gtest/moz.build create mode 100644 testing/marionette/atoms/moz.build create mode 100644 testing/marionette/components/moz.build create mode 100644 testing/marionette/moz.build create mode 100644 testing/mochitest/MochiKit/moz.build create mode 100644 testing/mochitest/chrome/moz.build create mode 100644 testing/mochitest/dynamic/moz.build create mode 100644 testing/mochitest/moz.build create mode 100644 testing/mochitest/roboextender/moz.build create mode 100644 testing/mochitest/ssltunnel/moz.build create mode 100644 testing/mochitest/static/moz.build create mode 100644 testing/mochitest/tests/MochiKit-1.4.2/MochiKit/moz.build create mode 100644 testing/mochitest/tests/MochiKit-1.4.2/moz.build create mode 100644 testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/moz.build create mode 100644 testing/mochitest/tests/MochiKit-1.4.2/tests/moz.build create mode 100644 testing/mochitest/tests/SimpleTest/moz.build create mode 100644 testing/mochitest/tests/browser/moz.build create mode 100644 testing/mochitest/tests/moz.build create mode 100644 testing/modules/moz.build create mode 100644 testing/mozbase/moz.build create mode 100644 testing/peptest/moz.build create mode 100644 testing/specialpowers/moz.build create mode 100644 testing/tools/screenshot/moz.build create mode 100644 testing/xpcshell/example/moz.build create mode 100644 testing/xpcshell/moz.build diff --git a/testing/gtest/moz.build b/testing/gtest/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/gtest/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/marionette/Makefile.in b/testing/marionette/Makefile.in index 8ccf5dbcdca..65cbf611285 100644 --- a/testing/marionette/Makefile.in +++ b/testing/marionette/Makefile.in @@ -9,12 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_MARIONETTE - DIRS += components \ - atoms \ - $(NULL) -endif - ifdef ENABLE_TESTS DEFINES += -DENABLE_TESTS endif diff --git a/testing/marionette/atoms/moz.build b/testing/marionette/atoms/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/marionette/atoms/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/marionette/components/moz.build b/testing/marionette/components/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/marionette/components/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/marionette/moz.build b/testing/marionette/moz.build new file mode 100644 index 00000000000..f34302fa5c0 --- /dev/null +++ b/testing/marionette/moz.build @@ -0,0 +1,7 @@ +# 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/. + +if CONFIG['ENABLE_MARIONETTE']: + DIRS += ['components', 'atoms'] diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in index 82df27199e4..59dd950a3b5 100644 --- a/testing/mochitest/Makefile.in +++ b/testing/mochitest/Makefile.in @@ -11,19 +11,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = \ - MochiKit \ - static \ - dynamic \ - tests \ - chrome \ - ssltunnel \ - $(NULL) - -ifeq ($(MOZ_BUILD_APP),mobile/android) -DIRS += roboextender -endif - NO_JS_MANIFEST = 1 MOZ_CHROME_FILE_FORMAT = jar DIST_FILES = install.rdf diff --git a/testing/mochitest/MochiKit/moz.build b/testing/mochitest/MochiKit/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/mochitest/MochiKit/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/mochitest/chrome/moz.build b/testing/mochitest/chrome/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/mochitest/chrome/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/mochitest/dynamic/moz.build b/testing/mochitest/dynamic/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/mochitest/dynamic/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/mochitest/moz.build b/testing/mochitest/moz.build new file mode 100644 index 00000000000..62404a53bf6 --- /dev/null +++ b/testing/mochitest/moz.build @@ -0,0 +1,16 @@ +# 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 += [ + 'MochiKit', + 'static', + 'dynamic', + 'tests', + 'chrome', + 'ssltunnel', +] + +if CONFIG['MOZ_BUILD_APP'] == 'mobile/android': + DIRS += ['roboextender'] diff --git a/testing/mochitest/roboextender/moz.build b/testing/mochitest/roboextender/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/mochitest/roboextender/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/mochitest/ssltunnel/moz.build b/testing/mochitest/ssltunnel/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/mochitest/ssltunnel/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/mochitest/static/moz.build b/testing/mochitest/static/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/mochitest/static/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/mochitest/tests/Makefile.in b/testing/mochitest/tests/Makefile.in index 355b0881bbd..1f560486e81 100644 --- a/testing/mochitest/tests/Makefile.in +++ b/testing/mochitest/tests/Makefile.in @@ -11,12 +11,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -PARALLEL_DIRS = \ - MochiKit-1.4.2 \ - SimpleTest \ - browser \ - $(NULL) - include $(topsrcdir)/config/rules.mk _TEST_FILES = \ diff --git a/testing/mochitest/tests/MochiKit-1.4.2/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/Makefile.in index 94121e5e20b..24b4d83506b 100644 --- a/testing/mochitest/tests/MochiKit-1.4.2/Makefile.in +++ b/testing/mochitest/tests/MochiKit-1.4.2/Makefile.in @@ -10,10 +10,4 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -PARALLEL_DIRS = \ - MochiKit \ - tests \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/moz.build b/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/mochitest/tests/MochiKit-1.4.2/moz.build b/testing/mochitest/tests/MochiKit-1.4.2/moz.build new file mode 100644 index 00000000000..88c357cde9b --- /dev/null +++ b/testing/mochitest/tests/MochiKit-1.4.2/moz.build @@ -0,0 +1,6 @@ +# 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/. + +PARALLEL_DIRS += ['MochiKit', 'tests'] diff --git a/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in index 39b7019b09f..9ce5e2cb712 100644 --- a/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in +++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in @@ -12,10 +12,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -PARALLEL_DIRS = \ - SimpleTest \ - $(NULL) - include $(topsrcdir)/config/rules.mk _TEST_FILES = \ diff --git a/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/moz.build b/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/mochitest/tests/MochiKit-1.4.2/tests/moz.build b/testing/mochitest/tests/MochiKit-1.4.2/tests/moz.build new file mode 100644 index 00000000000..6d9b77f2ee3 --- /dev/null +++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/moz.build @@ -0,0 +1,6 @@ +# 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/. + +PARALLEL_DIRS += ['SimpleTest'] diff --git a/testing/mochitest/tests/SimpleTest/moz.build b/testing/mochitest/tests/SimpleTest/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/mochitest/tests/SimpleTest/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/mochitest/tests/browser/moz.build b/testing/mochitest/tests/browser/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/mochitest/tests/browser/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/mochitest/tests/moz.build b/testing/mochitest/tests/moz.build new file mode 100644 index 00000000000..78390b0ec66 --- /dev/null +++ b/testing/mochitest/tests/moz.build @@ -0,0 +1,10 @@ +# 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/. + +PARALLEL_DIRS += [ + 'MochiKit-1.4.2', + 'SimpleTest', + 'browser', +] diff --git a/testing/modules/moz.build b/testing/modules/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/modules/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/mozbase/moz.build b/testing/mozbase/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/mozbase/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/peptest/moz.build b/testing/peptest/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/peptest/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/specialpowers/moz.build b/testing/specialpowers/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/specialpowers/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/tools/screenshot/moz.build b/testing/tools/screenshot/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/tools/screenshot/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/xpcshell/Makefile.in b/testing/xpcshell/Makefile.in index 8dea4634962..8c299761135 100644 --- a/testing/xpcshell/Makefile.in +++ b/testing/xpcshell/Makefile.in @@ -12,10 +12,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = testing_xpcshell -# Here's how you let the build system know there are tests in the -# "example" folder: -TEST_DIRS += example - include $(topsrcdir)/config/rules.mk # Harness files from the srcdir diff --git a/testing/xpcshell/example/moz.build b/testing/xpcshell/example/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/testing/xpcshell/example/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/testing/xpcshell/moz.build b/testing/xpcshell/moz.build new file mode 100644 index 00000000000..a7c10e219e6 --- /dev/null +++ b/testing/xpcshell/moz.build @@ -0,0 +1,6 @@ +# 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/. + +TEST_DIRS += ['example']