mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Bug 1238469 - Part 1: Refactor b2g emulator tests to remove the usage of custom mozharness configs; r=ahal
--HG-- extra : commitid : 2e4WuYA27ii extra : rebase_source : bba3ef39c5fae573ad407a602eccc272550c2b41
This commit is contained in:
Edgar Chen
parent
49c47f5901
commit
03e3ec3323
@ -1,4 +1,6 @@
|
||||
# This is a template config file for b2g emulator unittest production.
|
||||
# TODO: This could be removed after B2G ICS emulator buildbot builds is turned
|
||||
# off, Bug 1209180.
|
||||
import os
|
||||
|
||||
config = {
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
# This is a template config file for b2g emulator unittest testing
|
||||
|
||||
config = {
|
||||
# mozharness script options
|
||||
"application": "b2g",
|
||||
"test_suite": "xpcshell", # reftest, mochitest or xpcshell
|
||||
|
||||
"emulator_url": "http://127.0.1.1/b2g/emulator.zip", # url to emulator zip file
|
||||
"installer_url": "http://127.0.1.1/b2g/b2g.tar.gz", # url to gecko build
|
||||
"xre_url": "http://127.0.1.1/b2g/xpcshell.zip", # url to xpcshell zip file
|
||||
"test_url": "http://127.0.1.1/b2g/tests.zip", # url to tests.zip
|
||||
"busybox_url": "http://127.0.1.1/b2g/busybox", # url to busybox binary
|
||||
|
||||
# testsuite options
|
||||
#"adb_path": "path/to/adb", # defaults - os.environ['ADB_PATH']
|
||||
#"test_manifest": "path/to/manifest", # defaults - mochitest: "b2g.json"
|
||||
# reftest: "tests/layout/reftests/reftest.list"
|
||||
# xpcshell: "tests/xpcshell.ini"
|
||||
"total_chunks": 1,
|
||||
"this_chunk": 1,
|
||||
}
|
||||
@ -0,0 +1,181 @@
|
||||
#!/usr/bin/env python
|
||||
import os.path
|
||||
config = {
|
||||
# mozharness options
|
||||
"application": "b2g",
|
||||
"tooltool_cache": "/builds/tooltool_cache",
|
||||
|
||||
"find_links": [
|
||||
"http://pypi.pvt.build.mozilla.org/pub",
|
||||
"http://pypi.pub.build.mozilla.org/pub",
|
||||
],
|
||||
"pip_index": False,
|
||||
|
||||
"default_actions": [
|
||||
'clobber',
|
||||
'download-and-extract',
|
||||
'create-virtualenv',
|
||||
'install',
|
||||
'run-tests',
|
||||
],
|
||||
"download_symbols": "ondemand",
|
||||
# We bake this directly into the tester image now.
|
||||
"download_minidump_stackwalk": False,
|
||||
"default_blob_upload_servers": [
|
||||
"https://blobupload.elasticbeanstalk.com",
|
||||
],
|
||||
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
|
||||
|
||||
"run_file_names": {
|
||||
"jsreftest": "runreftestb2g.py",
|
||||
"mochitest": "runtestsb2g.py",
|
||||
"mochitest-chrome": "runtestsb2g.py",
|
||||
"reftest": "runreftestb2g.py",
|
||||
"crashtest": "runreftestb2g.py",
|
||||
"xpcshell": "runtestsb2g.py",
|
||||
"cppunittest": "remotecppunittests.py"
|
||||
},
|
||||
"suite_definitions": {
|
||||
"cppunittest": {
|
||||
"options": [
|
||||
"--dm_trans=adb",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
"--xre-path=%(xre_path)s",
|
||||
"--addEnv",
|
||||
"LD_LIBRARY_PATH=/vendor/lib:/system/lib:/system/b2g",
|
||||
"--with-b2g-emulator=%(b2gpath)s",
|
||||
"--emulator=%(emulator)s",
|
||||
"."
|
||||
],
|
||||
"run_filename": "remotecppunittests.py",
|
||||
"testsdir": "cppunittest"
|
||||
},
|
||||
"crashtest": {
|
||||
"options": [
|
||||
"--adbpath=%(adbpath)s",
|
||||
"--b2gpath=%(b2gpath)s",
|
||||
"--emulator=%(emulator)s",
|
||||
"--emulator-res=800x1000",
|
||||
"--logdir=%(logcat_dir)s",
|
||||
"--remote-webserver=%(remote_webserver)s",
|
||||
"--ignore-window-size",
|
||||
"--xre-path=%(xre_path)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
"--busybox=%(busybox)s",
|
||||
"--total-chunks=%(total_chunks)s",
|
||||
"--this-chunk=%(this_chunk)s",
|
||||
"--suite=crashtest",
|
||||
],
|
||||
"tests": ["tests/testing/crashtest/crashtests.list",],
|
||||
"run_filename": "runreftestb2g.py",
|
||||
"testsdir": "reftest"
|
||||
},
|
||||
"jsreftest": {
|
||||
"options": [
|
||||
"--adbpath=%(adbpath)s",
|
||||
"--b2gpath=%(b2gpath)s",
|
||||
"--emulator=%(emulator)s",
|
||||
"--emulator-res=800x1000",
|
||||
"--logdir=%(logcat_dir)s",
|
||||
"--remote-webserver=%(remote_webserver)s",
|
||||
"--ignore-window-size",
|
||||
"--xre-path=%(xre_path)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
"--busybox=%(busybox)s",
|
||||
"--total-chunks=%(total_chunks)s",
|
||||
"--this-chunk=%(this_chunk)s",
|
||||
"--extra-profile-file=jsreftest/tests/user.js",
|
||||
],
|
||||
"tests": ["jsreftest/tests/jstests.list",],
|
||||
"run_filename": "remotereftest.py",
|
||||
"testsdir": "reftest"
|
||||
},
|
||||
"mochitest": {
|
||||
"options": [
|
||||
"--adbpath=%(adbpath)s",
|
||||
"--b2gpath=%(b2gpath)s",
|
||||
"--emulator=%(emulator)s",
|
||||
"--logdir=%(logcat_dir)s",
|
||||
"--remote-webserver=%(remote_webserver)s",
|
||||
"--xre-path=%(xre_path)s",
|
||||
"--utility-path=%(utility_path)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
"--busybox=%(busybox)s",
|
||||
"--total-chunks=%(total_chunks)s",
|
||||
"--this-chunk=%(this_chunk)s",
|
||||
"--quiet",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--certificate-path=%(certificate_path)s",
|
||||
"--screenshot-on-fail",
|
||||
],
|
||||
"tests": ["%(test_path)s"],
|
||||
"run_filename": "runtestsb2g.py",
|
||||
"testsdir": "mochitest"
|
||||
},
|
||||
"mochitest-chrome": {
|
||||
"options": [
|
||||
"--adbpath=%(adbpath)s",
|
||||
"--b2gpath=%(b2gpath)s",
|
||||
"--emulator=%(emulator)s",
|
||||
"--logdir=%(logcat_dir)s",
|
||||
"--remote-webserver=%(remote_webserver)s",
|
||||
"--xre-path=%(xre_path)s",
|
||||
"--utility-path=%(utility_path)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
"--busybox=%(busybox)s",
|
||||
"--total-chunks=%(total_chunks)s",
|
||||
"--this-chunk=%(this_chunk)s",
|
||||
"--quiet",
|
||||
"--chrome",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--certificate-path=%(certificate_path)s",
|
||||
"--screenshot-on-fail",
|
||||
],
|
||||
"tests": ["%(test_path)s"],
|
||||
"run_filename": "runtestsb2g.py",
|
||||
"testsdir": "mochitest"
|
||||
},
|
||||
"reftest": {
|
||||
"options": [
|
||||
"--adbpath=%(adbpath)s",
|
||||
"--b2gpath=%(b2gpath)s",
|
||||
"--emulator=%(emulator)s",
|
||||
"--emulator-res=800x1000",
|
||||
"--logdir=%(logcat_dir)s",
|
||||
"--remote-webserver=%(remote_webserver)s",
|
||||
"--ignore-window-size",
|
||||
"--xre-path=%(xre_path)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
"--busybox=%(busybox)s",
|
||||
"--total-chunks=%(total_chunks)s",
|
||||
"--this-chunk=%(this_chunk)s",
|
||||
"--enable-oop",
|
||||
],
|
||||
"tests": ["tests/layout/reftests/reftest.list",],
|
||||
"run_filename": "runreftestsb2g.py",
|
||||
"testsdir": "reftest"
|
||||
},
|
||||
"xpcshell": {
|
||||
"options": [
|
||||
"--adbpath=%(adbpath)s",
|
||||
"--b2gpath=%(b2gpath)s",
|
||||
"--emulator=%(emulator)s",
|
||||
"--logdir=%(logcat_dir)s",
|
||||
"--manifest=tests/xpcshell.ini",
|
||||
"--use-device-libs",
|
||||
"--testing-modules-dir=%(modules_dir)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
"--busybox=%(busybox)s",
|
||||
"--total-chunks=%(total_chunks)s",
|
||||
"--this-chunk=%(this_chunk)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
],
|
||||
"run_filename": "runtestsb2g.py",
|
||||
"testsdir": "xpcshell"
|
||||
}
|
||||
},
|
||||
"vcs_output_timeout": 1760,
|
||||
}
|
||||
@ -12,10 +12,7 @@ task:
|
||||
- entrypoint
|
||||
- >
|
||||
python ./mozharness/scripts/b2g_emulator_unittest.py
|
||||
--config-file ./mozharness/configs/b2g/emulator_automation_config.py
|
||||
--config-file ./mozharness_configs/emulator_override.py
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--download-symbols ondemand
|
||||
--config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
|
||||
--test-suite cppunittest
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
|
||||
@ -13,10 +13,7 @@ task:
|
||||
- entrypoint
|
||||
- >
|
||||
python ./mozharness/scripts/b2g_emulator_unittest.py
|
||||
--config-file ./mozharness/configs/b2g/emulator_automation_config.py
|
||||
--config-file ./mozharness_configs/emulator_override.py
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--download-symbols ondemand
|
||||
--config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
|
||||
--test-suite crashtest
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
|
||||
@ -12,10 +12,7 @@ task:
|
||||
- entrypoint
|
||||
- >
|
||||
python ./mozharness/scripts/b2g_emulator_unittest.py
|
||||
--config-file ./mozharness/configs/b2g/emulator_automation_config.py
|
||||
--config-file ./mozharness_configs/emulator_override.py
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--download-symbols ondemand
|
||||
--config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
|
||||
--test-suite jsreftest
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
|
||||
@ -13,12 +13,7 @@ task:
|
||||
- entrypoint
|
||||
- >
|
||||
python ./mozharness/scripts/b2g_emulator_unittest.py
|
||||
--no-read-buildbot-config
|
||||
--config-file ./mozharness/configs/b2g/emulator_automation_config.py
|
||||
--config-file ./mozharness_configs/gaia_integration_override.py
|
||||
--config-file ./mozharness_configs/emulator_override.py
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--download-symbols ondemand
|
||||
--config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
|
||||
--test-suite mochitest
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
|
||||
@ -12,12 +12,7 @@ task:
|
||||
- entrypoint
|
||||
- >
|
||||
python ./mozharness/scripts/b2g_emulator_unittest.py
|
||||
--no-read-buildbot-config
|
||||
--config-file ./mozharness/configs/b2g/emulator_automation_config.py
|
||||
--config-file ./mozharness_configs/gaia_integration_override.py
|
||||
--config-file ./mozharness_configs/emulator_override.py
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--download-symbols ondemand
|
||||
--config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
|
||||
--test-suite mochitest
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
|
||||
@ -15,10 +15,7 @@ task:
|
||||
- entrypoint
|
||||
- >
|
||||
python ./mozharness/scripts/b2g_emulator_unittest.py
|
||||
--config-file ./mozharness/configs/b2g/emulator_automation_config.py
|
||||
--config-file ./mozharness_configs/emulator_override.py
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--download-symbols ondemand
|
||||
--config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
|
||||
--test-suite reftest
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
|
||||
@ -13,9 +13,7 @@ task:
|
||||
- entrypoint
|
||||
- >
|
||||
python ./mozharness/scripts/b2g_emulator_unittest.py
|
||||
--config-file ./mozharness/configs/b2g/emulator_automation_config.py
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--download-symbols ondemand
|
||||
--config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
|
||||
--test-suite xpcshell
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user