mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1207071 - remove plugins references in talos. r=jmaher 

--HG--
extra : commitid : LAeiQdbCkDK
extra : rebase_source : fb4982ddd8eb930394f5aaadaa1839794803749d
This commit is contained in:
Julien Pagès 2015-09-24 19:46:43 +02:00
Родитель 1f39d33b09
Коммит c6b4a8afe3
2 изменённых файлов: 4 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
testing/mozharness/mozharness/mozilla/testing/talos.py
Просмотреть файл

@ -408,12 +408,6 @@ class Talos(TestingMixin, MercurialScript, BlobUploadMixin):
src_manifest_file = os.path.join(c['webroot'], self.query_pagesets_manifest_path())
dest_manifest_file = abs_pagesets_paths['pagesets_manifest']
self.copyfile(src_manifest_file, dest_manifest_file, error_level=FATAL)
if 'suite' in c:
plugins_url = self.talos_json_config['suites'][c['suite']].get('plugins', {}).get(c['system_bits'])
if plugins_url:
self.info("Downloading plugin...")
# TODO add this path to talos.json ?
self._download_unzip(plugins_url, os.path.join(talos_webdir, 'base_profile'))
# Action methods. {{{1
# clobber defined in BaseScript

32
testing/talos/talos.json
Просмотреть файл

@ -46,22 +46,14 @@
"tests": ["tp5o_scroll", "glterrain"],
"pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
"pagesets_parent_dir_path": "talos/page_load_test/",
"pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest",
"plugins": {
"32": "http://talos-bundles.pvt.build.mozilla.org/zips/flash32_10_3_183_5.zip",
"64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
}
"pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest"
},
"g1-e10s": {
"tests": ["tp5o_scroll", "glterrain"],
"talos_options": ["--e10s"],
"pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
"pagesets_parent_dir_path": "talos/page_load_test/",
"pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest",
"plugins": {
"32": "http://talos-bundles.pvt.build.mozilla.org/zips/flash32_10_3_183_5.zip",
"64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
}
"pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest"
},
"g2": {
"tests": ["damp", "tps"],
@ -93,32 +85,20 @@
"tests": ["tp5o"],
"pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
"pagesets_parent_dir_path": "talos/page_load_test/",
"pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest",
"plugins": {
"32": "http://talos-bundles.pvt.build.mozilla.org/zips/flash32_10_3_183_5.zip",
"64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
}
"pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest"
},
"tp5o-e10s": {
"tests": ["tp5o"],
"talos_options": ["--e10s"],
"pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
"pagesets_parent_dir_path": "talos/page_load_test/",
"pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest",
"plugins": {
"32": "http://talos-bundles.pvt.build.mozilla.org/zips/flash32_10_3_183_5.zip",
"64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
}
"pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest"
},
"xperf": {
"tests": ["tp5n"],
"pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
"pagesets_parent_dir_path": "talos/page_load_test/",
"pagesets_manifest_path": "talos/page_load_test/tp5n/tp5n.manifest",
"plugins": {
"32": "http://talos-bundles.pvt.build.mozilla.org/zips/flash32_10_3_183_5.zip",
"64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
},
"talos_options": [
"--xperf_path",
"\"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe\""
@ -129,10 +109,6 @@
"pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
"pagesets_parent_dir_path": "talos/page_load_test/",
"pagesets_manifest_path": "talos/page_load_test/tp5n/tp5n.manifest",
"plugins": {
"32": "http://talos-bundles.pvt.build.mozilla.org/zips/flash32_10_3_183_5.zip",
"64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
},
"talos_options": [
"--e10s",
"--xperf_path",