--- a/process/factory.py
+++ b/process/factory.py
@@ -1373,35 +1373,31 @@ class MercurialBuildFactory(MozillaBuild
machPath = '%(basedir)s/build/mach'
# we need abs paths because we are in a non relative workdir
printconfig_base_command = python + [
WithProperties(machPath), 'python',
WithProperties('%(basedir)s/build' + '%s/config/printconfigsetting.py' % self.mozillaSrcDir),
WithProperties('%(basedir)s/build' + '/%s/dist/bin/application.ini' % self.mozillaObjdir),
]
- self.addStep(MockProperty(
+ self.addStep(SetProperty(
command=printconfig_base_command + ['App', 'BuildID'],
property='buildid',
workdir=printconfig_workdir,
env=printconfig_env,
description=['getting', 'buildid'],
descriptionDone=['got', 'buildid'],
- mock=self.use_mock,
- target=self.mock_target,
))
- self.addStep(MockProperty(
+ self.addStep(SetProperty(
command=printconfig_base_command + ['App', 'SourceStamp'],
property='sourcestamp',
workdir=printconfig_workdir,
env=printconfig_env,
description=['getting', 'sourcestamp'],
- descriptionDone=['got', 'sourcestamp'],
- mock=self.use_mock,
- target=self.mock_target,
+ descriptionDone=['got', 'sourcestamp']
))
self._gotBuildInfo = True
def addBuildAnalysisSteps(self):
if self.platform in ('linux', 'linux64'):
# Analyze the number of ctors
def get_ctors(rc, stdout, stderr):
try:
@@ -1673,42 +1669,36 @@ class MercurialBuildFactory(MozillaBuild
else:
machPath = '%(basedir)s/build/mach'
# we need abs paths because we are in a non relative workdir
printconfig_base_command = python + [
WithProperties(machPath), 'python',
WithProperties('%(basedir)s/build' + '%s/config/printconfigsetting.py' % self.mozillaSrcDir),
WithProperties('%(basedir)s/build' + '/%s/dist/bin/application.ini' % self.mozillaObjdir),
]
- self.addStep(MockProperty(
+ self.addStep(SetProperty(
command=printconfig_base_command + ['App', 'BuildID'],
property='buildid',
workdir=printconfig_workdir,
env=printconfig_env,
name='get_build_id',
- mock=self.use_mock,
- target=self.mock_target,
))
- self.addStep(MockProperty(
+ self.addStep(SetProperty(
command=printconfig_base_command + ['App', 'Version'],
property='appVersion',
workdir=printconfig_workdir,
env=printconfig_env,
name='get_app_version',
- mock=self.use_mock,
- target=self.mock_target,
))
- self.addStep(MockProperty(
+ self.addStep(SetProperty(
command=printconfig_base_command + ['App', 'Name'],
property='appName',
workdir=printconfig_workdir,
env=printconfig_env,
name='get_app_name',
- mock=self.use_mock,
- target=self.mock_target,
))
self.pkg_env = pkg_env
def addUploadSteps(self):
if self.multiLocale:
self.doUpload(postUploadBuildDir='en-US')
cmd = ['python', '%s/%s' % (self.mozharness_path, self.multiLocaleScript),
'--config-file', self.multiLocaleConfig]