Bug 1200294 - we should get rid of minidump_stackwalk binaries in talos sources. r=jmaher

This commit is contained in:
Julien Pagès 2015-08-31 22:41:49 +02:00
parent ba97164715
commit 324082e5ec
5 changed files with 25 additions and 0 deletions

View File

@ -1,7 +1,14 @@
import os
import platform
PYTHON = '/tools/buildbot/bin/python'
VENV_PATH = '%s/build/venv' % os.getcwd()
if platform.architecture()[0] == '64bit':
TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux64/releng.manifest"
MINIDUMP_STACKWALK_PATH = "linux64-minidump_stackwalk"
else:
TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux32/releng.manifest"
MINIDUMP_STACKWALK_PATH = "linux32-minidump_stackwalk"
config = {
"log_name": "talos",
@ -17,6 +24,7 @@ config = {
"exes": {
'python': PYTHON,
'virtualenv': [PYTHON, '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
"title": os.uname()[1].lower().split('.')[0],
"default_actions": [
@ -35,4 +43,8 @@ config = {
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
"download_minidump_stackwalk": True,
"minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
"minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
"tooltool_cache": "/builds/tooltool_cache",
}

View File

@ -27,6 +27,7 @@ config = {
"exes": {
'python': PYTHON,
'virtualenv': [PYTHON, '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
"title": os.uname()[1].lower().split('.')[0],
"default_actions": [
@ -52,4 +53,8 @@ config = {
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
"download_minidump_stackwalk": True,
"minidump_stackwalk_path": "macosx64-minidump_stackwalk",
"minidump_tooltool_manifest_path": "config/tooltool-manifests/macosx64/releng.manifest",
"tooltool_cache": "/builds/tooltool_cache",
}

View File

@ -26,6 +26,7 @@ config = {
'mozinstall': ['%s/scripts/python' % VENV_PATH,
'%s/scripts/mozinstall-script.py' % VENV_PATH],
'hg': 'c:/mozilla-build/hg/hg',
'tooltool.py': [PYTHON, 'C:/mozilla-build/tooltool.py'],
},
"title": socket.gethostname().split('.')[0],
"default_actions": [
@ -47,4 +48,7 @@ config = {
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
"metro_harness_path_frmt": "%(metro_base_path)s/metro/metrotestharness.exe",
"download_minidump_stackwalk": True,
"minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
"minidump_tooltool_manifest_path": "config/tooltool-manifests/win32/releng.manifest",
}

View File

@ -167,6 +167,7 @@ class Talos(TestingMixin, MercurialScript, BlobUploadMixin):
self.workdir = self.query_abs_dirs()['abs_work_dir'] # convenience
self.run_local = self.config.get('run_local')
self.installer_url = self.config.get("installer_url")
self.talos_json_url = self.config.get("talos_json_url")
self.talos_json = self.config.get("talos_json")
@ -567,6 +568,8 @@ class Talos(TestingMixin, MercurialScript, BlobUploadMixin):
error_list=TalosErrorList)
env = {}
env['MOZ_UPLOAD_DIR'] = self.query_abs_dirs()['abs_blob_upload_dir']
if not self.run_local:
env['MINIDUMP_STACKWALK'] = self.query_minidump_stackwalk()
env['MINIDUMP_SAVE_PATH'] = self.query_abs_dirs()['abs_blob_upload_dir']
if not os.path.isdir(env['MOZ_UPLOAD_DIR']):
self.mkdir_p(env['MOZ_UPLOAD_DIR'])

View File

@ -60,6 +60,7 @@ class TalosRunner(MozbuildObject):
def make_config(self):
self.config = {
'run_local': True,
'talos_json': self.talos_json,
'binary_path': self.binary_path,
'log_name': 'talos',