Bug 1411736 - Convert xpcshellConstantsPP.js to FINAL_TARGET_PP_FILES. r=firefox-build-system-reviewers,froydnj
authorChris Manchester <cmanchester@mozilla.com>
Tue, 21 Aug 2018 14:58:39 +0000
changeset 432672 568230ce860e86538ee9d567fdd6fcec46142c8d
parent 432671 9bf437ef1af2a65aa5fe4384a37f4e066d9c66ac
child 432673 6c479457064ffd32edfdb78fd43538a87f17dd55
push id34483
push userapavel@mozilla.com
push dateWed, 22 Aug 2018 03:34:42 +0000
treeherdermozilla-central@bdf392eff10e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfirefox-build-system-reviewers, froydnj
bugs1411736
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1411736 - Convert xpcshellConstantsPP.js to FINAL_TARGET_PP_FILES. r=firefox-build-system-reviewers,froydnj Differential Revision: https://phabricator.services.mozilla.com/D3855
toolkit/mozapps/update/tests/Makefile.in
toolkit/mozapps/update/tests/data/xpcshellConstantsPP.js
toolkit/mozapps/update/tests/moz.build
--- a/toolkit/mozapps/update/tests/Makefile.in
+++ b/toolkit/mozapps/update/tests/Makefile.in
@@ -1,17 +1,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/.
 
-XPCSHELLTESTROOT = $(topobjdir)/_tests/xpcshell/$(relativesrcdir)
-
-pp_const_file = $(srcdir)/data/xpcshellConstantsPP.js
-
-PP_TARGETS            += aus-test-const
-aus-test-const        := $(pp_const_file)
-aus-test-const_PATH   := $(XPCSHELLTESTROOT)/data
-aus-test-const_FLAGS  := -Fsubstitution $(DEFINES) $(ACDEFINES)
-aus-test-const_TARGET := misc
-
 MOZ_WINCONSOLE = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/mozapps/update/tests/data/xpcshellConstantsPP.js
+++ b/toolkit/mozapps/update/tests/data/xpcshellConstantsPP.js
@@ -1,12 +1,14 @@
 /* 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/. */
 
+#filter substitution
+
 /* Preprocessed constants used by xpcshell tests */
 
 const INSTALL_LOCALE = "@AB_CD@";
 const MOZ_APP_NAME = "@MOZ_APP_NAME@";
 const BIN_SUFFIX = "@BIN_SUFFIX@";
 
 // MOZ_APP_VENDOR is optional.
 #ifdef MOZ_APP_VENDOR
--- a/toolkit/mozapps/update/tests/moz.build
+++ b/toolkit/mozapps/update/tests/moz.build
@@ -106,14 +106,18 @@ FINAL_TARGET_FILES += [
     'data/simple.mar',
     'data/wrong_product_channel.mar',
     'data/xpcshellUtilsAUS.js',
     'TestAUSReadStrings1.ini',
     'TestAUSReadStrings2.ini',
     'TestAUSReadStrings3.ini',
 ]
 
+FINAL_TARGET_PP_FILES += [
+    'data/xpcshellConstantsPP.js',
+]
+
 with Files("browser/browser_TelemetryUpdatePing.js"):
     BUG_COMPONENT = ("Toolkit", "Telemetry")
 
 if CONFIG['CC_TYPE'] == 'gcc':
     CXXFLAGS += ['-Wno-format-truncation']