Bug 981030 - Fix outdated stage-config in testsuite-targets.mk, r=bustage, a=test-only
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Thu, 27 Mar 2014 15:25:36 -0400
changeset 120030 610edd7a4a2b4c9b0f4530db174594f5adba4e0a
parent 120029 24ed63715d1b7691257179170d943dba95057924
child 120031 39ca424b200356766eef8fb4a7ea97c2951ce4ca
push id1157
push userahalberstadt@mozilla.com
push dateThu, 27 Mar 2014 19:29:14 +0000
reviewersbustage, test-only
bugs981030
milestone18.1
Bug 981030 - Fix outdated stage-config in testsuite-targets.mk, r=bustage, a=test-only
testing/config/Makefile.in
testing/config/mozharness_config.py
testing/testsuite-targets.mk
deleted file mode 100644
--- a/testing/config/Makefile.in
+++ /dev/null
@@ -1,24 +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/.
-
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-
-CONFIG_FILES = \
-  mozharness_config.py \
-  $(NULL)
-
-_DEST_DIR = $(DEPTH)/_tests/config
-libs:: $(CONFIG_FILES)
-	$(PYTHON) $(topsrcdir)/config/nsinstall.py $^ $(_DEST_DIR)
-
-stage-package: PKG_STAGE = $(DIST)/test-package-stage
-stage-package:
-	$(NSINSTALL) -D $(PKG_STAGE)/config
-	@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(CONFIG_FILES)) | (cd $(PKG_STAGE)/config && tar -xf -)
deleted file mode 100644
--- a/testing/config/mozharness_config.py
+++ /dev/null
@@ -1,28 +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/.
-
-"""The config defined in this module is read by mozharness, which is a
-tool used to run many of the tests reporting to TBPL. This file is
-primarily useful for pushing custom test harness configurations to try.
-
-For example you can define a custom mochitest configuration by adding:
-    "mochitest_options": [
-        "--appname=%(binary_path)s", "--utility-path=tests/bin",
-        "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s",
-        "--certificate-path=tests/certs", "--autorun", "--close-when-done",
-        "--console-level=INFO", "--setpref=webgl.force-enabled=true"
-    ],
-
-Be warned that these values will be picked up by all platforms and changing them
-may result in unexpected behaviour. For example, the above will break B2G
-mochitests.
-
-You must also provide the complete command line to avoid errors. The official
-configuration files containing the default values live in:
-    https://hg.mozilla.org/build/mozharness/configs
-"""
-
-config = {
-    'use_puppetagain_packages': True,
-}
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -382,17 +382,18 @@ make-stage-dir:
 	$(NSINSTALL) -D $(PKG_STAGE)/peptest
 	$(NSINSTALL) -D $(PKG_STAGE)/mozbase
 	$(NSINSTALL) -D $(PKG_STAGE)/modules
 
 stage-b2g: make-stage-dir
 	$(NSINSTALL) $(topsrcdir)/b2g/test/b2g-unittest-requirements.txt $(PKG_STAGE)/b2g
 
 stage-config: make-stage-dir
-	$(MAKE) -C $(DEPTH)/testing/config stage-package
+	$(NSINSTALL) -D $(PKG_STAGE)/config
+	@(cd $(topsrcdir)/testing/config && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/config && tar -xf -)
 
 robotium-id-map:
 ifeq ($(MOZ_BUILD_APP),mobile/android)
 	$(PYTHON) $(DEPTH)/build/mobile/robocop/parse_ids.py -i $(DEPTH)/mobile/android/base/R.java -o $(DEPTH)/build/mobile/robocop/fennec_ids.txt
 endif
 
 stage-mochitest: robotium-id-map
 stage-mochitest: make-stage-dir