wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1234281 - Use adb for Android x86 emulator tests; r=kmoir

Browse Source
This commit is contained in:
Geoff Brown 2015-12-21 14:24:09 -07:00
parent dcf98bec0d
commit ffb40fa0ed
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
testing/mozharness/configs/android/androidx86.py
View File

@ -5,8 +5,6 @@ config = {
"host_utils_url": "http://talos-remote.pvt.build.mozilla.org/tegra/tegra-host-utils.Linux.1109310.2.zip",
"robocop_package_name": "org.mozilla.roboexample.test",
"device_ip": "127.0.0.1",
"default_sut_port1": "20701",
"default_sut_port2": "20700", # does not prompt for commands
"tooltool_manifest_path": "testing/config/tooltool-manifests/androidx86/releng.manifest",
"tooltool_cache": "/builds/tooltool_cache",
"emulator_manifest": """
@ -21,7 +19,7 @@ config = {
] """,
"emulator_process_name": "emulator64-x86",
"emulator_extra_args": "-debug init,console,gles,memcheck,adbserver,adbclient,adb,avd_config,socket -qemu -m 1024 -enable-kvm",
"device_manager": "sut",
"device_manager": "adb",
"exes": {
'adb': '%(abs_work_dir)s/android-sdk18/platform-tools/adb',
'python': '/tools/buildbot/bin/python',
@ -50,8 +48,6 @@ config = {
"http_port": "8854", # starting http port to use for the mochitest server
"ssl_port": "4454", # starting ssl port to use for the server
"emulator_port": 5554,
"sut_port1": 20701,
"sut_port2": 20700
},
{
"name": "test-2",
@ -59,8 +55,6 @@ config = {
"http_port": "8856", # starting http port to use for the mochitest server
"ssl_port": "4456", # starting ssl port to use for the server
"emulator_port": 5556,
"sut_port1": 20703,
"sut_port2": 20702
},
{
"name": "test-3",
@ -68,8 +62,6 @@ config = {
"http_port": "8858", # starting http port to use for the mochitest server
"ssl_port": "4458", # starting ssl port to use for the server
"emulator_port": 5558,
"sut_port1": 20705,
"sut_port2": 20704
},
{
"name": "test-4",
@ -77,20 +69,15 @@ config = {
"http_port": "8860", # starting http port to use for the mochitest server
"ssl_port": "4460", # starting ssl port to use for the server
"emulator_port": 5560,
"sut_port1": 20707,
"sut_port2": 20706
}
],
"suite_definitions": {
"mochitest": {
"run_filename": "runtestsremote.py",
"options": ["--dm_trans=sut",
"--app=%(app)s",
"options": ["--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
@ -109,8 +96,6 @@ config = {
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--httpd-path", "%(modules_dir)s",
@ -119,10 +104,7 @@ config = {
},
"xpcshell": {
"run_filename": "remotexpcshelltests.py",
"options": ["--dm_trans=sut",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--xre-path=%(xre_path)s",
"options": ["--xre-path=%(xre_path)s",
"--testing-modules-dir=%(modules_dir)s",
"--apk=%(installer_path)s",
"--no-logfiles",